From 2a5d7a14fc383329fc7ec45b3f96479bd2c18e26 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 15:32:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 4 +-
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 82 +++++++++++++++++++++++------------------
src/components/LayerController/modules/LcServiceLayerFilter.vue | 2
src/components/LayerController/logic/WasteWater.js | 2
src/components/panel/LegendPanel.vue | 12 +++---
src/components/panel/topicSearch/SewersSearch.vue | 4 +-
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 4 +
7 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 51d41e4..9ba4b4f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -6,29 +6,30 @@
<el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
<el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
</div>
- <div class="form-echrts">
- <div>
- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
- <el-dialog :visible.sync="dialogVisible"
- :append-to-body="true"
- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"
- width="68%"
- center
- v-dialogDrag
- >
- <div class="el-dialog-div" style="height: 500px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ <div class="form-echrts">
+ <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"-->
+ <div>
+ <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
+ <el-dialog :visible.sync="dialogVisible"
+ :append-to-body="true"
+ width="68%"
+ center
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 500px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
</div>
- </el-dialog>
+ <div style="width:750px;height:260px;" id="echarts" ref="main">
+ </div>
</div>
- <div style="width:750px;height:260px;" id="echarts" ref="main">
- </div>
- </div>
</div>
</template>
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+
export default {
name: 'ECharts',
components: {
@@ -38,6 +39,9 @@
return {
watchData: [],
dialogVisible: false,
+ options: {
+ dialogVisible: false,
+ dataDate: [],
options: {
title: {
// text: '鎶樼嚎鍥惧爢鍙�'
@@ -118,7 +122,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
+ data: ['鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚', '鍛ㄥ叚'],
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -199,23 +203,27 @@
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
- // const option = {}
myChart.setOption(this.options)
}
},
mounted () {
this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs))
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
console.log(dataWatch)
+ for (var i = 0; i < dataWatch.length; i++) {
+ this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
+ }
+ console.log(this.dataDate)
}
}
</script>
<style scoped lang="less">
- .Infomation{
+ .Infomation {
margin-left: 10px;
}
- .el-tag{
+
+ .el-tag {
height: 25px;
line-height: 25px;
margin-right: 10px;
@@ -225,21 +233,23 @@
border: none;
padding: 0 15px;
}
- .form-echrts{
- width: 100%;
- height: 100%;
- border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div{
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
- #echarts {
- margin: 0;
- padding: 0;
- //border: 1px solid #396d83;
+
+ .form-echrts {
+ width: 100%;
+ height: 100%;
+ border: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
}
- }
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 8fd38d7..8ec4d71 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,9 +5,9 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炶瘯鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>鏈堟暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
</ul>
<component :is="currentTab" v-bind="$attrs"></component>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 4510bc3..0422b5f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -38,7 +38,9 @@
},
mounted () {
this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
+ // console.log(this.$attrs.getWasteGasDetails)
+ this.tableData = this.$attrs.getWasteWaterMonitoringDetails
+ console.log(this.$attrs.getWasteWaterMonitoringDetails)
}
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 31e0d53..b6bbf06 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -61,7 +61,7 @@
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
- console.log(e.layer.options.test)
+ // console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
this.setPanTo(e.latlng, 240)
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 8b64b1f..a617f78 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -103,7 +103,7 @@
font-size: 13px;
position: absolute;
- left: 2.5rem;
+ left: 260px;
z-index: 1000;
height: 220px;
top: 0;
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index fe6d347..d14a1b3 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -1,13 +1,13 @@
<template>
<div class="legend-panel">
<transition name="fade">
- <div :class="'legend-content map-background'" v-show="legendControl">
+ <div :class="'legend-content map-background'" v-show="isShow">
<div class="legend-content-box" v-for="(item,index) in serviceLayers" :key="index">
<p><span>{{ item.name }}</span></p>
<div class="map-under-line"></div>
<ul>
- <li v-for="(ite,inde) in item.layers" :key="inde">
- <img :src='ite.legendImage' alt=''>
+ <li v-for="(ite,idx) in item.layers" :key="idx">
+ <img :src="ite.legendImage===undefined?'../.././assets/images/map-pages/setting.png':ite.legendImage" alt=''>
<span>{{ ite.name }}</span>
</li>
</ul>
@@ -15,7 +15,7 @@
</div>
</transition>
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥句緥" placement="left">
- <div :class="this.legendControl?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
+ <div :class="this.isShow?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
@click="legendChange()">
<i class="el-icon-more-outline"></i>
</div>
@@ -38,14 +38,14 @@
data () {
return {
// 鎺у埗鍥句緥 鍐呭鐨� 鏄剧ず/闅愯棌
- legendControl: false,
+ isShow: false,
serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
}
},
methods: {
// 鍥炬爣 鎺у埗鍐呭鐨勫睍绀轰笌闅愯棌
legendChange () {
- this.legendControl = !this.legendControl
+ this.isShow = !this.isShow
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 46e94a3..79f5f03 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -164,8 +164,8 @@
wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
- if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
- this.list = res.data.features
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
}
},
handleLocation (val) {
--
Gitblit v1.8.0