From 1750486cc4c353e2b7e639360bab7b95336a43ff Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 11:30:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 45 +
src/conf/Topic.js | 15
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 30
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 52 -
src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue | 623 ++++++++++++++++++------
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 659 +++++++++++++++++++++----
src/components/panel/LegendPanel.vue | 15
src/components/BaseNav/PublicBounced/PublicBounced.vue | 9
src/components/LayerController/modules/LcServiceLayer.vue | 13
9 files changed, 1,130 insertions(+), 331 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 0790c3b..63f6a30 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -15,13 +15,13 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="value1"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
</span>
</div>
<div class="pickerData">
<span >缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="value2"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
</span>
</div>
</div>
@@ -66,81 +66,271 @@
},
data () {
return {
- value1: '',
- value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
value: '',
formInline: {
- user: '',
- region: ''
+ region: '',
+ timeStart: '',
+ timeEnd: ''
},
- info: this.series
+ info: this.series,
+ JsonDayCharts: {
+ id: 'mychartsDay',
+ title: '鍔犵儹鐐夌儫姘�',
+ legend: [
+ {
+ icon: 'image://../assets/imgs/legend/NOX.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ textStyle: {
+ color: '#CCC'
+ },
+ name: '姘哀鍖栫墿'
+ },
+ {
+ icon: 'image://../assets/imgs/legend/SO2.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#CCC'
+ }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/YanChen.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '鐑熷皹',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/WenDu.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '娓╁害',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/VOCs.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '搴熸皵娴侀噺',
+ textStyle: { color: '#ccc' }
+ }
+ ],
+ xdata: ['1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�', '17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '24鏃�', '25鏃�', '26鏃�', '27鏃�', '28鏃�', '29鏃�', '30鏃�', '31鏃�'],
+ ydatas: [
+ { name: '姘哀鍖栫墿', data: ['40.01', '44.38', '44.71', '40.43', '42.79', '46.00', '52.66', '48.75', '45.75', '49.24', '54.22', '52.25', '53.34', '65.72', '60.01', '54.20', '48.37', '45.56', '42.58', '40.96', '45.14', '49.31', '54.21', '57.89', '51.18', '60.21', '57.76', '60.33', '48.34', '45.66', '53.38'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 100 },
+ { name: '浜屾哀鍖栫～', data: ['9.22', '8.07', '8.69', '9.16', '6.25', '5.78', '15.91', '3232992.75', '11.34', '13.63', '14.13', '11.47', '8.48', '9.46', '7.85', '5.91', '4.64', '4.77', '6.99', '5.82', '5.59', '5.30', '6.62', '9.00', '13.35', '2.68', '1.89', '0.70', '3.68', '6.25', '5.14'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 50 },
+ {
+ name: '搴熸皵娴侀噺',
+ data: ['2827518.25', '2763525.75', '2776435.50', '2742003.50', '2856001.75', '2890287.00', '2832898.25', '2803715.50', '2513925.75', '2753303.50', '2749836.00', '2786188.50', '2738838.00', '2733660.25', '2815521.25', '2830217.25', '2798918.00', '2803543.50', '2770175.25', '2823321.25', '2856329.25', '2801588.00', '2798103.50', '2766343.00', '2750489.50', '2697786.25', '2796775.50', '2808028.50', '2813561.75', '2757129.25', '2720755.50'],
+ zdcbcolor: 'red',
+ zxcolor: '#9ACD32',
+ bzz: null
+ },
+ { name: '鐑熷皹', data: ['3.88', '3.48', '3.85', '3.99', '3.99', '4.48', '3.96', '3.36', '2.79', '4.65', '4.70', '5.08', '4.55', '4.90', '4.43', '3.10', '2.64', '2.84', '2.63', '2.69', '2.56', '2.32', '2.51', '3.29', '3.40', '3.06', '2.94', '2.90', '2.80', '3.07', '4.55'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 30 }
+ ],
+ yname: ' 娴撳害(mg/m鲁)',
+ // id:'mychartDay',
+ datatype: 1
+ }
}
},
methods: {
onSubmit () {
console.log('submit!')
+ this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
- drawChart: function () {
- window.onresize = function () {
- var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
- if (h1 > 700) {
- this.myChart.getDom().style.height = 3 + 'rem'
- this.myChart.getDom().style.width = 6 + 'rem'
- } else {
- this.myChart.getDom().style.height = 3 + 'rem'
- this.myChart.getDom().style.width = 6 + 'rem'
- }
- this.myChart.resize()
+
+ CreateChart: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+ this.mychartDay = this.$echarts.init(this.$refs.main)
+ this.mychartDay.clear()
+ var dataUnit = ''
+ if (datatype === 1) {
+ dataUnit = '姘旈噺(m鲁/d)'
+ } else {
+ dataUnit = '姘旈噺(m鲁/h)'
}
- },
- initOptions: function (dateDate, series) {
- var options = {
- title: {
- // text: '鎶樼嚎鍥惧爢鍙�'
- },
- color: ['#446cdc', '#c4c916', '#c1187e'],
- tooltip: {
+
+ var serLists = []
+ for (var j = 0; j < ydatas.length; j++) {
+ var len = ydatas[j].data.length
+ for (var k = 0; k < len; k++) {
+ var it = ydatas[j].data[k]
+ var it2 = parseFloat(it).toFixed(2)
+ ydatas[j].data[k] = it2
+ }
+ }
+
+ for (var i = 0; i < ydatas.length; i++) {
+ // var zdcbcolor = ydatas[i].zdcbcolor
+ var bzz = ydatas[i].bzz
+ var obj
+ if (bzz == null) {
+ obj = {
+ name: ydatas[i].name,
+ symbol: 'circle', // 鎶樼偣褰㈢姸
+ symbolSize: 10, // 澶у皬
+ smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ yAxisIndex: 1,
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // var biaozhuiz
+ // for (var i = 0; i < exhbzzList.length; i++) {
+ // if (exhbzzList[i].name == c.seriesName) {
+ // biaozhuiz = exhbzzList[i].bzhui
+ // }
+ // }
+ // if (c.value > 999999999999) {
+ // return zdcbcolor
+ // } else {
+ // return '#33c95f'
+ // }
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
+ type: 'line',
+ data: ydatas[i].data
+ }
+ } else {
+ obj = {
+ name: ydatas[i].name,
+ symbol: 'circle', // 鎶樼偣褰㈢姸
+ symbolSize: 10, // 澶у皬
+ smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // var biaozhuiz
+ // for (var i = 0; i < exhbzzList.length; i++) {
+ // if (exhbzzList[i].name == c.seriesName) {
+ // biaozhuiz = exhbzzList[i].bzhui
+ // }
+ // }
+ // if (c.value > biaozhuiz) {
+ // return zdcbcolor
+ // } else if (c.value > biaozhuiz * 0.9) {
+ // return '#FFA500'
+ // } else {
+ // return '#33c95f'
+ // }
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
+ type: 'line',
+ data: ydatas[i].data,
+ markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
+ symbol: 'none',
+ data: [
+ /* {
+ type: 'average',
+ name: '鏃ュ钩鍧囧��',
+ label: {
+ normal: {
+ position: 'end', //鏄剧ず浣嶇疆
+ formatter: ydatas[i].name+'\n鏃ュ钩鍧囧��'+'{c}' //鏄剧ず鏍峰紡
+ }
+ },
+ lineStyle:{ // 棰滆壊
+ color: 'yellow',
+ type:'solid'
+ }
+ }, */ {
+ label: {
+ normal: {
+ position: 'end',
+ formatter: '' // ydatas[i].name+'鏍囧噯鍊�'//+'{c}'
+ }
+ },
+ name: '鏍囧噯鍊�',
+ yAxis: bzz,
+ lineStyle: {
+ color: ydatas[i].zxcolor,
+ type: 'dashed',
+ width: 2
+ }
+ }
+ ]
+ }
+ }
+ }
+ serLists.push(obj)
+ }
+
+ var option = {
+ tooltip: { // 鎻愮ず妗�
trigger: 'axis',
axisPointer: {
type: 'cross',
label: {
color: '#1a4245'
}
+ },
+ formatter: function (params) {
+ var s = params[0].name + '<br/>'
+ for (var i = 0; i < params.length; i++) {
+ // const name = params[i].name
+ // 鍥捐〃title鍚嶇О
+ var seriesName = params[i].seriesName
+ // 鍊�
+ var value = params[i].value
+ var valueFliter
+ if (value === 'NaN') {
+ valueFliter = ''
+ } else {
+ // valueFliter = formatter(value)
+ }
+ var maker = params[i].marker
+ if (seriesName === '浜屾哀鍖栫～') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
+ } else if (seriesName === '姘哀鍖栫墿') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
+ } else if (seriesName === '鐑熷皹') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
+ } else if (seriesName === '娓╁害') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#F206FF;"></span>'
+ } else {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
+ }
+ s += maker + seriesName + ':' + valueFliter + '<br />'
+ }
+ return s
}
},
- legend: {
- x: '200px',
- y: '30px',
- data: [{
- name: 'COD',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '姘ㄦ爱',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '搴熸按娴侀噺',
- textStyle: {
- color: '#00d0f9'
- }
- }]
+ toolbox: { // 鎵撳嵃绛夊伐鍏�
+ show: false,
+ feature: {
+ saveAsImage: {}
+ }
},
- grid: {
- left: '3%',
- right: '3%',
- bottom: '3%',
- containLabel: true
+ grid: { // 缃戞牸
+ top: '20%',
+ left: '5%'
+ // containLabel: true
},
- toolbox: {},
- // 鍥炬爣缂╂斁璁剧疆
+ legend: { // 鍥句緥
+ data: legend
+ },
dataZoom: [{
type: 'inside',
start: 0,
@@ -149,6 +339,7 @@
start: 0,
end: 100,
show: false,
+ handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
handleSize: '80%',
handleStyle: {
color: '#fff',
@@ -158,20 +349,17 @@
shadowOffsetY: 2
}
}],
- // x杞寸殑璁剧疆
- xAxis: {
+ xAxis: { // x 杞磋缃�
type: 'category',
boundaryGap: false,
- data: dateDate,
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
textStyle: {
- color: '#fff',
- fontSize: 10
+ color: '#fff'
}
},
- splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
+ splitLine: { // 缃戞牸鍨傜洿绾夸负 铏氱嚎
show: true,
lineStyle: {
type: 'dashed'
@@ -183,95 +371,336 @@
axisLine: {
lineStyle: {
color: '#FFFFFF',
- width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
- }
+ },
+ data: xdata
},
- // Y 杞寸殑璁剧疆
yAxis: [{
type: 'value',
- position: 'left', // 澶� Y 杞翠娇鐢�
- name: '娴撳害(mg/m鲁)',
+ name: yname,
+ // max: function (value) {
+ // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // if (exhbzzList && exhbzzList.length > 0) {
+ // if (value.max != '-Infinity') { // 鑾峰彇鎵�鏈夌洃娴嬫寚鏍囩殑max鍊� 2020/12/31
+ // valMax = parseInt(value.max + 5)
+ // }
+ // $.each(exhbzzList, function (index, item) {
+ // if (item.bzhui != null) {
+ // max_val_list.push(item.bzhui)
+ // }
+ // })
+ // }
+ // max_val_list = max_val_list.sort(function (a, b) { return a - b }) // 鎺掑簭
+ // var ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
+ // return parseInt(ma)
+ // },
axisLabel: {
formatter: '{value}',
textStyle: {
- color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ color: '#fff'
}
},
axisPointer: {
- snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ snap: true
},
splitLine: {
- show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- },
+ show: false
+ }, // y杞� 缃戞牸绾夸笉鏄剧ず,
axisLine: {
lineStyle: {
- color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- width: 1
+ color: '#FFFFFF',
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
}
- },
- {
+ }, {
type: 'value',
- position: 'right', // 澶� Y 杞翠娇鐢�
- name: '娴侀噺(m鲁/h鲁)',
+ name: dataUnit,
+ max: function (value) {
+ var ma = value.max > 120 ? value.max : 120
+ return parseInt(ma)
+ },
axisLabel: {
formatter: '{value}',
textStyle: {
- color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ color: '#fff'
}
},
axisPointer: {
- snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ snap: true
},
splitLine: {
- show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- },
+ show: false
+ }, // y杞� 缃戞牸绾夸笉鏄剧ず,
axisLine: {
lineStyle: {
- color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- width: 1
+ color: '#FFFFFF',
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
}
}],
- series: series
+ series: serLists
}
- return options
+ this.mychartDay.setOption(option)
+
+ // this.mychartDay.on('legendselectchanged', function (params) {
+ // var StdVal = null
+ // var op = { yAxis: {} }
+ // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // if (exhbzzList && exhbzzList.length > 0) {
+ // max_val_list.push(valMax) // 灏嗙洃娴嬫寚鏍囩殑max鍊间篃鏀惧叆鏁扮粍 2020/12/31
+ // $.each(exhbzzList, function (index, item) {
+ // params.selected[item.name] ? max_val_list.push(item.bzhui) : ''
+ // if (item.name == params.name) {
+ // item.name == 'VOCs' ? StdVal = 20 : StdVal = item.bzhui
+ // }
+ // })
+ // }
+ // max_val_list = max_val_list.sort(function (a, b) { return a - b }) // 鎺掑簭
+ // op.yAxis.max = function (value) {
+ // var ma = value.max < StdVal ? StdVal : Math.ceil(value.max)
+ // max_val_list ? ma = max_val_list[max_val_list.length - 1] : ''// 閫夋嫨鏈�澶у��
+ // return ma
+ // }
+ // this.mychartDay.setOption(op)
+ // })
+
+ /**
+ * 瑙ｅ喅mychartDay.on('click',function(){...})浜嬩欢閲嶅瑙﹀彂鐨勯棶棰�
+ * Date: 20200720
+ */
+ this.mychartDay.off('click')
+
+ /**
+ * 鍥炬爣鐐瑰嚮浜嬩欢
+ * 20190426 add
+ * */
+ // this.mychartDay.on('click', function (params) {
+ // // 鑾峰彇褰撳墠鏃堕棿锛屽皬鏃�
+ // var nowHours = new Date().Format('hh')
+ // // 鐐瑰嚮鎶樼嚎鍥炬姌鐐瑰搴旂殑鏃堕棿
+ // // 闇�瑕佷紶鐨勬椂闂翠负
+ // var _date = null
+ // if (params.name.indexOf('鏃�') !== -1) {
+ // var hours = params.name.substring(0, params.name.indexOf('鏃�'))
+ // if (parseInt(hours) < parseInt(nowHours)) {
+ // _date = new Date().Format('yyyy-MM-dd') + ' ' + hours + ':00:00'
+ // } else {
+ // var currentDate = new Date()
+ // // 24灏忔椂涔嬪墠鏃堕棿
+ // var stringDate = new Date(currentDate.getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+ // _date = stringDate + ' ' + hours + ':00:00'
+ // }
+ // } else if (params.name.indexOf('鏃�') !== -1) {
+ // var day = params.name.substring(0, params.name.indexOf('鏃�') - 1)
+ // _date = new Date().Format('yyyy-MM') + '-' + day.trim()
+ // }
+
+ // todo 璋冩帴鍙� 鏌ュ嚟璇�
+ // if (params.color != 'red') {
+ // var poltMtrlId
+ // var monItemId = 28
+ // for (var i = 0; i < wrwIDS.length; i++) {
+ // if (params.seriesName == wrwIDS[i].name) {
+ // poltMtrlId = wrwIDS[i].id
+ // }
+ // }
+ // getCBMX(jcdID, poltMtrlId, monItemId, _date, function (res) {
+ // createDivByMouse(res, params.event)
+ // })
+ // }
+ // createDivByMouse("s",params.event);
+ // })
+ },
+ drawChart: function () {
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ this.mychartDay.getDom().style.height = 3 + 'rem'
+ this.mychartDay.getDom().style.width = 6 + 'rem'
+ } else {
+ this.mychartDay.getDom().style.height = 3 + 'rem'
+ this.mychartDay.getDom().style.width = 6 + 'rem'
+ }
+ this.mychartDay.resize()
+ }
}
+ // initOptions: function (dateDate, series) {
+ // var options = {
+ // title: {
+ // // text: '鎶樼嚎鍥惧爢鍙�'
+ // },
+ // color: ['#446cdc', '#c4c916', '#c1187e'],
+ // tooltip: {
+ // trigger: 'axis',
+ // axisPointer: {
+ // type: 'cross',
+ // label: {
+ // color: '#1a4245'
+ // }
+ // }
+ // },
+ // legend: {
+ // x: '200px',
+ // y: '30px',
+ // data: [{
+ // name: 'COD',
+ // textStyle: {
+ // color: '#00d0f9'
+ // }
+ // },
+ // {
+ // name: '姘ㄦ爱',
+ // textStyle: {
+ // color: '#00d0f9'
+ // }
+ // },
+ // {
+ // name: '搴熸按娴侀噺',
+ // textStyle: {
+ // color: '#00d0f9'
+ // }
+ // }]
+ // },
+ // grid: {
+ // left: '3%',
+ // right: '3%',
+ // bottom: '3%',
+ // containLabel: true
+ // },
+ // toolbox: {},
+ // // 鍥炬爣缂╂斁璁剧疆
+ // dataZoom: [{
+ // type: 'inside',
+ // start: 0,
+ // end: 100
+ // }, {
+ // start: 0,
+ // end: 100,
+ // show: false,
+ // handleSize: '80%',
+ // handleStyle: {
+ // color: '#fff',
+ // shadowBlur: 3,
+ // shadowColor: 'rgba(0, 0, 0, 0.6)',
+ // shadowOffsetX: 2,
+ // shadowOffsetY: 2
+ // }
+ // }],
+ // // x杞寸殑璁剧疆
+ // xAxis: {
+ // type: 'category',
+ // boundaryGap: false,
+ // data: dateDate,
+ // axisLabel: { // x杞村叏閮ㄦ樉绀�
+ // rotate: 20,
+ // interval: 0,
+ // textStyle: {
+ // color: '#fff',
+ // fontSize: 10
+ // }
+ // },
+ // splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
+ // show: true,
+ // lineStyle: {
+ // type: 'dashed'
+ // }
+ // },
+ // axisTick: { // x 杞村埢搴︽樉绀�
+ // show: false
+ // },
+ // axisLine: {
+ // lineStyle: {
+ // color: '#FFFFFF',
+ // width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ // }
+ // }
+ // },
+ // // Y 杞寸殑璁剧疆
+ // yAxis: [{
+ // type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
+ // name: '娴撳害(mg/m鲁)',
+ // axisLabel: {
+ // formatter: '{value}',
+ // textStyle: {
+ // color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ // }
+ // },
+ // axisPointer: {
+ // snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ // },
+ // splitLine: {
+ // show: false // y杞� 缃戞牸绾夸笉鏄剧ず
+ // },
+ // axisLine: {
+ // lineStyle: {
+ // color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
+ // width: 1
+ // }
+ // }
+ // },
+ // {
+ // type: 'value',
+ // position: 'right', // 澶� Y 杞翠娇鐢�
+ // name: '娴侀噺(m鲁/h鲁)',
+ // axisLabel: {
+ // formatter: '{value}',
+ // textStyle: {
+ // color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ // }
+ // },
+ // axisPointer: {
+ // snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ // },
+ // splitLine: {
+ // show: false // y杞� 缃戞牸绾夸笉鏄剧ず
+ // },
+ // axisLine: {
+ // lineStyle: {
+ // color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
+ // width: 1
+ // }
+ // }
+ // }],
+ // series: series
+ // }
+ // return options
+ // }
},
mounted () {
- this.$nextTick(() => {
- this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonDateData)).reverse()
- console.log(dataWatch)
- var dateDate = []
- // {COD:[3,4,5]}
- var data = {}
- for (var n = 0; n < dataWatch.length; n++) {
- var d = dataWatch[n].MonTimeStr.substring(5, 9)
- if (dateDate.indexOf(d) < 0) {
- dateDate.push(d)
- }
- if (data[dataWatch[n].PoltmtrlName]) {
- data[dataWatch[n].PoltmtrlName].push(dataWatch[n].MonQty)
- } else {
- data[dataWatch[n].PoltmtrlName] = [dataWatch[n].MonQty]
- }
- }
- var series = []
- for (var k in data) {
- series.push({
- name: k,
- type: 'line',
- yAxisIndex: k === '搴熸按娴侀噺' ? 1 : 0,
- data: data[k]
- })
- }
- console.log(series)
- const opitons = this.initOptions(dateDate, series)
- this.myChart = this.$echarts.init(this.$refs.main)
- this.myChart.setOption(opitons)
- })
+ // this.$nextTick(() => {
+ // this.drawChart()
+ // const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonDateData)).reverse()
+ // console.log(dataWatch)
+ // var dateDate = []
+ // // {COD:[3,4,5]}
+ // var data = {}
+ // for (var n = 0; n < dataWatch.length; n++) {
+ // var d = dataWatch[n].MonTimeStr.substring(5, 9)
+ // if (dateDate.indexOf(d) < 0) {
+ // dateDate.push(d)
+ // }
+ // if (data[dataWatch[n].PoltmtrlName]) {
+ // data[dataWatch[n].PoltmtrlName].push(dataWatch[n].MonQty)
+ // } else {
+ // data[dataWatch[n].PoltmtrlName] = [dataWatch[n].MonQty]
+ // }
+ // }
+ // var series = []
+ // for (var k in data) {
+ // series.push({
+ // name: k,
+ // type: 'line',
+ // yAxisIndex: k === '搴熸按娴侀噺' ? 1 : 0,
+ // data: data[k]
+ // })
+ // }
+ // console.log(series)
+ // const opitons = this.initOptions(dateDate, series)
+ // this.mychartDay = this.$echarts.init(this.$refs.main)
+ // this.mychartDay.setOption(opitons)
+ // })
}
}
</script>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index d3af27b..ce8f4e9 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -141,22 +141,16 @@
}
}
},
+ // mounted () {
+ // // this.$nextTick(() => {
+ // // console.log(1)
+ // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
+ // // }
+ // },
methods: {
onSubmit () {
- console.log(1)
-
- // const date = [this.value1, this.value2, this.formInline.region]
- // if (this.$attrs.)
- // console.log(this.$attrs.)
+ console.log(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
- // console.log(date)
- // if (date) {
- // var date1 = new Date(date)
- // date1 = new Date(date1.getTime() - (8 * 3600000))
- // console.log(date1)
- // var dateUtil = new DateUtil()
- // var datePkg = dateUtil.getTowDate(date1, "a", 24 * 3600000 - 1);
- // var datatype = 2;
},
CreateChart: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
this.myChart = this.$echarts.init(this.$refs.main)
@@ -311,9 +305,10 @@
var valueFliter
if (value === 'NaN') {
valueFliter = ''
- } else {
- // valueFliter = formatter(value)
}
+ // else {
+ // // valueFliter = formatter(value)
+ // }
var maker = params[i].marker
if (seriesName === '浜屾哀鍖栫～') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -526,21 +521,20 @@
}
// createDivByMouse("s",params.event);
}) */
- },
- drawChart: function () {
- window.onresize = function () {
- var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
- if (h1 > 700) {
- this.myChart.getDom().style.height = 3 + 'rem'
- this.myChart.getDom().style.width = 6 + 'rem'
- } else {
- this.myChart.getDom().style.height = 3 + 'rem'
- this.myChart.getDom().style.width = 6 + 'rem'
- }
- this.myChart.resize()
- }
}
-
+ // drawChart: function () {
+ // window.onresize = function () {
+ // var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ // if (h1 > 700) {
+ // this.myChart.getDom().style.height = 3 + 'rem'
+ // this.myChart.getDom().style.width = 6 + 'rem'
+ // } else {
+ // this.myChart.getDom().style.height = 3 + 'rem'
+ // this.myChart.getDom().style.width = 6 + 'rem'
+ // }
+ // this.myChart.resize()
+ // }
+ // }
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
index a803441..feb9840 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
@@ -1,10 +1,49 @@
<template>
- <div style="width:5rem;height:2rem;margin-top: 0.3rem" ref="echarts"></div>
+ <div id="Tab">
+ <div class="animation">
+ <div class="infomation">
+ <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ </div>
+ </div>
+ <div class="form-echrts">
+ <div class="from-search">
+ <div class="pickerMon">
+ <div class="pickerData">
+ <span> 寮�濮嬫椂闂�:</span>
+ <span class="pickerTable">
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
+ </span>
+ </div>
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
+ <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
+ </span>
+ </div>
+ </div>
+ <div>
+ 閲囨牱鐐规暟:
+ <el-select v-model="formInline.region" placeholder="50">
+ <el-option label="0" value="0"></el-option>
+ <el-option label="25" value="25"></el-option>
+ <el-option label="50" value="50"></el-option>
+ <el-option label="75" value="75"></el-option>
+ <el-option label="100" value="100"></el-option>
+ </el-select>
+ </div>
+ <div class="detailbtn" @click="onSubmit">鏌ヨ</div>
+ </div>
+ <div style="width:5rem;height:2rem;" ref="echarts"></div>
+ </div>
+ </div>
</template>
<script>
-import mapApi from '@/api/mapApi'
+// import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
@@ -13,134 +52,310 @@
data () {
return {
days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
- myChart: [],
- // x杞存暟鎹�
- xAxis: [],
- seriesData: [],
- seriesName: []
+ watchData: [],
+ dialogVisible: false,
+ myChar: null,
+ value: '',
+ formInline: {
+ region: '',
+ timeStart: '',
+ timeEnd: ''
+ },
+ RealTimeChart: null,
+ info: this.series,
+ JsonTimeCtarts: {
+ id: 'mychart_ss ',
+ title: '鐑熷皹',
+ legend: [
+ { name: '姘哀鍖栫墿', icon: 'image://../assets/imgs/legend/NOX.png', textStyle: { color: '#ccc' }, itemWidth: 20, itemHeight: 5 },
+ {
+ icon: 'image://../assets/imgs/legend/SO2.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#CCC'
+ }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/YanChen.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '鐑熷皹',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/VOCs.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '搴熸皵娴侀噺',
+ textStyle: { color: '#ccc' }
+ }
+ ],
+ ydatas: [
+ {
+ name: '姘哀鍖栫墿',
+ data: [{ name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 39.51431] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 38.76508] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.57471] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3796] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.10718] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.81126] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.9184] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.08839] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3718] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.8966] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.3998] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.11937] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.12424] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.99567] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.48063] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.62222] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.84583] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.80923] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.93465] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.78891] },
+ { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.54268] }],
+ zdcbcolor: 'red',
+ zxcolor: '#00B0F0',
+ bzz: 50
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ data: [{ name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.112573] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.578955] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.869465] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.270735] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.355475] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.242907] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.230558] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.262951] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.268744] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.159671] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.955352] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.110546] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.235723] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.443502] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.708939] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.882327] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 6.017494] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.410021] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.379694] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.551433] },
+ { name: '浜屾哀鍖栫～', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.819743] }],
+ zdcbcolor: 'red',
+ zxcolor: '#fff21c',
+ bzz: 50
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ data: [{ name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012617] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.992213] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.026886] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.052861] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038826] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.062339] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.071915] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.053693] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.03562] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.043983] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.059231] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.042176] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.028253] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.024891] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01542] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.025787] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038269] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01441] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.010105] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012341] },
+ { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.996146] }],
+ zdcbcolor: 'red',
+ zxcolor: '#9ACD32',
+ bzz: null
+ },
+ {
+ name: '鐑熷皹',
+ data: [{ name: '鐑熷皹', value: [['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8297127]] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8347292] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9218481] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.913429] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9026684] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8060119] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.781314] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8958074] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9093901] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8743498] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9024854] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9456897] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9747347] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9200308] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8987293] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8613345] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8747463] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8883187] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.881333] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9142911] },
+ { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9569058] }],
+ zdcbcolor: 'red',
+ zxcolor: '#f48183',
+ bzz: 10
+ }],
+ yname: ' 娴撳害(mg/m鲁)'
+ }
}
},
- mounted () {
- this.$nextTick(() => {
- this.initEchartsData()
- this.upDateEchartsData()
- })
- },
+ // mounted () {
+ // this.DrawEXHRealTimeDateChart()
+ // },
methods: {
- // 鍒濆鍖栨暟鎹�
- async initEchartsData () {
- const endTime = dayjs().add(1, 's')
- const data = {
- $tagCodeList: 'TJIP45.yyqAI90305,TJIP45.yyqAI90303,TJIP45.yyqFI_90310N,TJIP45.yyqAI90304,TJIP45.yyqAIR001',
- $startTime: this.dayjs,
- $endTime: endTime,
- $step: 15
- }
- const result = (await mapApi.DataItems(data)).data
- for (var i = 0; i < result.length; i++) {
- // console.log(result[i])
- this.xAxis.push(result[i].ReadTime)
- this.seriesData.push(result[i].TagValue)
- this.seriesName = result[i].UnionTagCode
- }
- this.upDateEchartsinit()
+ onSubmit () {
+ this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
},
- // 瀹炴椂鏁版嵁鍒锋柊
- upDateEchartsData () {
- // const interValHander =
- setInterval(async () => {
- const endTime = dayjs().add(1, 's')
- const data = {
- $tagCodeList: 'TJIP45.yyqAI90305,TJIP45.yyqAI90303,TJIP45.yyqFI_90310N,TJIP45.yyqAI90304,TJIP45.yyqAIR001',
- $startTime: this.dayjs,
- $endTime: endTime,
- $step: 15
- }
- const result = (await mapApi.DataItems(data)).data
- for (var i = 0; i < result.length; i++) {
- // console.log(result[i])
- // this.xAxis.shift()
- this.xAxis.push(result[i].ReadTime)
- this.seriesData.push(result[i].TagValue)
- this.seriesName = result[i].UnionTagCode
- }
- this.upDateEchartsinit()
- }, 1500)
- },
- // 鍒濆鍖杄charts
- upDateEchartsinit () {
- this.myChart = this.$echarts.init(this.$refs.echarts)
- // 鍥捐〃鐨勯厤缃」鏁版嵁
- const xAxisData = this.xAxis
- const legendData = [this.seriesName, 'TJIP45.lscl2tb552AISA11201B', 'TJIP45.lscl2tb552AISA11202A', 'TJIP45.lscl2tbAIA-10505-1', 'TJIP45.lscl2tbAIA-10505-2']
- const seriesData = [
- {
- name: this.seriesName,
- type: 'line',
- stack: '鎬婚噺',
- data: this.seriesData
- },
- {
- name: 'TJIP45.lscl2tb552AISA11201B',
- type: 'line',
- stack: '鎬婚噺',
- data: [2.20, 1.82, 1.91, 2.34, 2.90, 3.30, 3.10]
- }
- ]
- const option = {
- title: {
- // text: '瀹炴椂鏁版嵁',
- target: 'blank',
- left: '5%',
- textStyle: {
- color: '#fff',
- fontSize: 15,
- bottom: 20
+ // formatter (value, index) {
+ // return parseFloat(value).toFixed(2)
+ // },
+ DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
+ // this.myChart.clear()
+ var serLists = []
+ for (var i = 0; i < ydatas.length; i++) {
+ // var zdcbcolor = ydatas[i].zdcbcolor
+ var bz = ydatas[i].bzz
+ var obj
+ if (bz) {
+ obj = {
+ name: ydatas[i].name,
+ // symbol:'circle', // 鎶樼偣褰㈢姸
+ // symbolSize: 10, //澶у皬
+ smooth: true, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // var biaozhuiz
+ // for (var i = 0; i < exhbzzList.length; i++) {
+ // if (exhbzzList[i].name == c.seriesName) {
+ // biaozhuiz = exhbzzList[i].bzhui
+ // }
+ // }
+ // if (c.value[1] > biaozhuiz) {
+ // return zdcbcolor
+ // } else if (c.value[1] > biaozhuiz * 0.9) {
+ // return '#FFA500'
+ // } else {
+ // return '#33c95f'
+ // }
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 2
+ },
+ // borderColor:'black', //鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
+ type: 'line',
+ data: ydatas[i].data,
+ markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
+ symbol: 'none',
+ data: [{
+ label: {
+ normal: {
+ position: 'end',
+ formatter: ''// ydatas[i].name+'鏍囧噯鍊�' //+'{c}'
+ }
+ },
+ name: '鏍囧噯鍊�',
+ yAxis: bz,
+ lineStyle: {
+ color: ydatas[i].zxcolor,
+ type: 'dashed',
+ width: 2
+ }
+ }]
+ }
}
- },
- tooltip: {
+ } else {
+ obj = {
+ name: ydatas[i].name,
+ // symbol:'circle', // 鎶樼偣褰㈢姸
+ // symbolSize: 10, //澶у皬
+ smooth: true, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ return '#33c95f'
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 2
+ },
+ // borderColor:'black', //鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
+ type: 'line',
+ data: ydatas[i].data
+ }
+ }
+ if (ydatas[i].name === '搴熸皵娴侀噺' || ydatas[i].name === '搴熸皵') {
+ obj.yAxisIndex = 1
+ }
+ serLists.push(obj)
+ }
+ var option = {
+ /* title: {
+ text: title,
+ }, */
+ tooltip: { // 鎻愮ず妗�
trigger: 'axis',
axisPointer: {
type: 'cross',
label: {
color: '#1a4245'
}
+ },
+ formatter: function (params) {
+ var s = params[0].name + '<br />'
+ for (var i = 0; i < params.length; i++) {
+ // var name = params[i].name
+ // 鍥捐〃title鍚嶇О
+ var seriesName = params[i].seriesName
+ // 鍊�
+ var value = params[i].value[1]
+ var valueFliter = this.formatter(value)
+ var maker = params[i].marker
+ if (seriesName === '浜屾哀鍖栫～') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
+ } else if (seriesName === '姘哀鍖栫墿') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
+ } else if (seriesName === '鐑熷皹') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
+ } else if (seriesName === '娓╁害') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#F206FF;"></span>'
+ } else {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
+ }
+ s += maker + seriesName + ':' + valueFliter + '<br />'
+ }
+ return s
}
- // formatter: function (params) {
- // // console.log(params)
- // var UnionTagCode = params[0].seriesName + '<br />'
- // for (var i = 0; i < params.length; i++) {
- // var seriesName = params[i].seriesName
- // // 鍊�
- // var value = params[i].value[1]
- //
- // // var valueFliter = formatter(value)
- // var valueFliter = value
- //
- // var maker = params[i].marker
- // var colo = ''
- // switch (seriesName) {
- // case 'TJIP45.lscl2tb552AI10710':
- // colo = '#fff21c'
- // break
- // default:
- // colo = 'red'
- // break
- // }
- // maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:' + colo + ';"></span>'
- // UnionTagCode += maker + seriesName + ':' + valueFliter + '<br />'
- // }
- // return UnionTagCode
- // }
},
- grid: {
- top: '20%'
- },
- toolbox: {
+ toolbox: { // 鎵撳嵃绛夊伐鍏�
show: false,
feature: {
saveAsImage: {}
}
+ },
+ grid: { // 缃戞牸
+ top: '20%'
+ },
+ legend: {
+ data: legend
},
dataZoom: [{
type: 'inside',
@@ -160,62 +375,49 @@
shadowOffsetY: 2
}
}],
- legend: {
- data: legendData,
- textStyle: {
- color: '#ffffff',
- fontSize: 12
- }
- },
- xAxis: {
- type: 'category',
- // type: 'time',
+ xAxis: { // x 杞磋缃�
+ type: 'time',
boundaryGap: false,
- axisLabel: {
+ axisLabel: { // x杞村叏閮ㄦ樉绀�
+ // rotate: 20,
margin: 6,
interval: 0,
textStyle: {
color: '#fff'
}
},
- splitLine: {
+ splitLine: { // 缃戞牸鍨傜洿绾夸负 铏氱嚎
show: true,
lineStyle: {
type: 'dashed'
}
},
- axisTick: {
+ axisTick: { // x 杞村埢搴︽樉绀�
show: false
},
axisLine: {
lineStyle: {
color: '#FFFFFF',
- width: 1
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
- },
- data: xAxisData
+ }
+ // data: xdata
},
yAxis: [{
type: 'value',
- name: 'yname',
- // max: function (value) {
- // var max_val_list = []; //鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
- // if (bzzList && bzzList.length > 0) {
- // $.each(bzzList, function (index, item) {
- // max_val_list.push(item.bzhui);
- // });
- // }
- // max_val_list = max_val_list.sort(function (a, b) {
- // return a - b
- // }); //鎺掑簭
- // var ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1];
- // return parseInt(ma);
- // },
+ name: yname,
+ max: function (value) {
+ var ma = value.max > 100 ? value.max : 100
+ return parseInt(ma)
+ },
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#fff'
}
+ },
+ axisPointer: {
+ snap: true
},
splitLine: {
show: false
@@ -223,36 +425,157 @@
axisLine: {
lineStyle: {
color: '#FFFFFF',
- width: 1
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
}
- }, {
+ }, { // 娴侀噺杞�
type: 'value',
- name: 'dataUnit',
+ name: '搴熸皵娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
color: '#fff'
}
},
+ axisPointer: {
+ snap: true
+ },
splitLine: {
show: false
- },
+ }, // y杞� 缃戞牸绾夸笉鏄剧ず,
axisLine: {
lineStyle: {
color: '#FFFFFF',
- width: 1
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
}
}
}],
- series: seriesData
+ series: serLists
}
- this.myChart.setOption(option)
+ this.RealTimeChart.setOption(option)
+
+ // this.RealTimeChart.on('legendselectchanged', function (params) {
+ // var StdVal = null
+ // var op = { yAxis: {} }
+ // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // if (exhbzzList && exhbzzList.length > 0) {
+ // $.each(exhbzzList, function (index, item) {
+ // params.selected[item.name] ? max_val_list.push(item.bzhui) : ''
+ // if (item.name === params.name) {
+ // item.name === 'VOCs' ? StdVal = 20 : StdVal = item.bzhui
+ // }
+ // })
+ // }
+ // max_val_list = max_val_list.sort(function (a, b) { return a - b }) // 鎺掑簭
+ // op.yAxis.max = function (value) {
+ // var ma = value.max < StdVal ? StdVal : Math.ceil(value.max)
+ // max_val_list ? ma = max_val_list[max_val_list.length - 1] : ''// 閫夋嫨鏈�澶у��
+ // return ma
+ // }
+ // RealTimeChart.setOption(op)
+ // })
+ // RealTimeChart.on('click', function (params) {
+ // var nowDate = new Date().Format()
+ // })
}
}
}
</script>
<style scoped lang="less">
+.grid-content {
+ font-size: 8px;
+ background-color: #2e4967;
+ text-align: center;
+ border-radius: 2px;
+ margin-right: 10px;
+ padding:0 10px
+}
+.animation {
+ //width: 600px;
+ //height: 0.06rem;
+ .infomation {
+ padding: 5px 10px;
+ }
+}
+.form-echrts {
+ width: 100%;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .from-search{
+ display: flex;
+ padding:5px;
+ >div{margin-left: 10px}
+ .pickerMon{
+ display: flex;
+ >div:first-child {
+ margin-right: 10px;
+ }
+ .pickerData{
+ flex: 1;
+ display: flex;
+ >span{line-height: 22px}
+ .pickerTable {
+ margin-left: 3px;
+ }
+ }
+ }
+ /deep/.el-date-editor--datetime{
+ width: 100%;
+ }
+ /deep/.el-input__inner{
+ position: relative;
+ width:140px;
+ background-color: #2e4967;
+ color: #fff;
+ font-size: 12px;
+ height: 24px;
+ padding: 0;
+ border-color:#00fff6;
+ text-align: center;
+ //padding-left:20px ;
+ //padding: 0!important;
+ }
+ /deep/.el-input__icon{
+ display: block;
+ width: 140px;
+ height: 22px;
+ line-height: 22px;
+ cursor: pointer;
+ font-size: 0;
+ }
+ .echatsInput{
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 80px;
+ height: 22px;
+ }
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
+ .detailbtn{
+ background-color:#2e4967;
+ text-align: center;
+ padding: 0 7px;
+ line-height: 20px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ }
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //height: 3rem;
+ //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 b346f75..aa20800 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,12 +5,11 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
- <li :class="active==0?'hover':''" @click='tabTaggle("ECharts",0)'>瀹炴椂鏁版嵁</li>
- <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
- <li :class="active==2?'hover':''" @click='tabTaggle("EChartsHourWasteWater",2)'>鏃ユ暟鎹�</li>
- <li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
</ul>
- <component :is="currentTab"></component>
<div class="legend" >
<span >姝ｅ父</span>
<i style=" background: #4ec99c;"></i>
@@ -19,33 +18,34 @@
<span >瓒呮爣</span>
<i style=" background: orange;"></i>
</div>
+ <component :is="currentTab" v-bind="$attrs"></component>
</div>
</template>
<script>
import EChartsHour from './EChartsHour'
-// import EChartsDate from './EChartsDate'
-import EChartsHourWasteWater from './EChartsHourWasteWater'
-import EChartsDateWasteWater from './EChartsDateWasteWater'
+import EChartsDate from './EChartsDate'
+import ECharts from './Echarts'
+// import EChartsHourWasteWater from './EChartsHourWasteWater'
+// import EChartsDateWasteWater from './EChartsDateWasteWater'
export default {
name: 'PublicChart',
components: {
EChartsHour,
- // EChartsDate
- EChartsHourWasteWater,
- EChartsDateWasteWater
+ EChartsDate,
+ ECharts
+ // EChartsHourWasteWater,
+ // EChartsDateWasteWater,
},
data () {
return {
- currentTab: 'EChartsHour',
- active: '0'
+ currentTab: 'EChartsHour'
}
},
methods: {
- tabTaggle (taggleMenu, num) {
+ tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- this.active = num
// debugger
}
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index abc4da6..01c6da1 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,6 +15,7 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ ref="PublicChart"
>
</public-chart>
</div>
@@ -56,6 +57,12 @@
getQueryOnlineMonData: []
// getGasQueryOnlineMonData: []
}
+ },
+ mounted () {
+ // this.$nextTick(() => {
+ // console.log(this.$refs.publicBounced)
+ // console.log(this.$refs.PublicChart)
+ // })
},
methods: {
closePopup () {
@@ -99,7 +106,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 45%;
+ top: 15%;
left: 20%;
.public-bounced-title {
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index f6af058..153db9d 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -7,7 +7,7 @@
<i class="downUp el-icon-caret-bottom" @click="item.isShow=!item.isShow" :class="item.isShow?'':'active'" ></i><!-- el-icon-arrow-down -->
<!-- 涓�绾у浘灞傞亶鍘� -->
<div style="padding-left:25px;padding-top:10px;color:#fff">
- <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
+ <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item,'')"/>{{ item.name }}
</div>
<div class="layerbox-item" v-show="item.isShow">
<!-- 浜岀骇鍥惧眰閬嶅巻 -->
@@ -16,7 +16,7 @@
:name="'wmsSublayers_'+item.code+'_'+itm.code"
:checked="itm.checked"
:value="itm.code"
- @change="swAllLayers(itm)"/>{{ itm.name }}
+ @change="swAllLayers(itm,item.name)"/>{{ itm.name }}
<!-- 涓夌骇鍥惧眰閬嶅巻 -->
<div class="layerbox-item-3">
<div class="basemap-layer-item" v-for="layer in itm.layers" :key="layer.code">
@@ -24,7 +24,7 @@
:name="'wmsSublayers_'+item.code+'_'+layer.code"
:checked="layer.checked"
:value="layer.code"
- @change="swAllLayers(layer)"/>
+ @change="swAllLayers(layer,'')"/>
<span :style="'color:'+layer.color">{{ layer.name }}</span>
</div>
</div>
@@ -39,7 +39,7 @@
<script>
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
-
+import bus from '@/eventBus'
export default {
name: 'LcServiceLayer',
components: { LcServiceLayerFilter },
@@ -51,11 +51,14 @@
mounted () {
},
methods: {
- swAllLayers (item) {
+ swAllLayers (item, v) {
// eslint-disable-next-line no-debugger
item.checked = !item.checked
this.toggleLayer(item)
this.swLayers(item.layers, item.checked)
+ if (v === '涓撻鍥惧眰') {
+ bus.$emit('changeSearchBar', item)
+ }
},
swLayers (layers, checked) {
if (layers) {
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index d14a1b3..36e0efd 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -32,7 +32,7 @@
import { LayerPipeLines } from '../../conf/layers/LayerPipeLines'
import { LayerPk } from '../../conf/layers/LayerPk'
import { LayerArea } from '../../conf/layers/LayerArea'
-
+import bus from '@/eventBus'
export default {
name: 'LegendPanel',
data () {
@@ -42,10 +42,23 @@
serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
}
},
+ mounted () {
+ const that = this
+ bus.$on('changeState', function (state) {
+ if (state.num !== 4 && state.type) {
+ that.isShow = false
+ }
+ })
+ },
methods: {
// 鍥炬爣 鎺у埗鍐呭鐨勫睍绀轰笌闅愯棌
legendChange () {
this.isShow = !this.isShow
+ const state = {
+ type: this.isShow,
+ num: 4
+ }
+ bus.$emit('changeState', state)
}
}
}
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 28910bb..cc2ba13 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -12,7 +12,7 @@
</div>
</li>
</ul> -->
- <ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
+ <ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" v-show="item.isShow" >
<el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
<li>
<img src="../../assets/images/map-pages/icon/sl.png" class="icon">
@@ -26,11 +26,11 @@
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
</div>
<div :class="'search-container map-background'" v-show="selectGroup" >
- <div @click="setSearchPanelChange" type="button" class="el-button special-button el-button--default ">
+ <div @click="setSearchPanelChange" class="el-button special-button el-button--default ">
<i class=" el-icon-d-arrow-right" v-if="selectGroup"></i>
<i class=" el-icon-d-arrow-left" v-else ></i>
</div>
- <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
+ <div class="el-message-box__content" style="padding:0;font-size: 13px;">
<component :title="title" :is="gcComp"></component>
</div>
</div>
@@ -55,6 +55,7 @@
import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch'
import SewersSearch from '@components/panel/topicSearch/SewersSearch'
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
+import bus from '@/eventBus'
export default {
name: 'MonitorPanel',
components: { GasWasteSearch, WaterWasteSearch, SolidWasteSearch, EnvRiskSearch, DischargeSearch },
@@ -66,7 +67,6 @@
topicCheckedList: [],
isPanelVisible: false,
gcComp: SewersSearch,
-
gdVisible: true,
hbVisible: false,
pkVisible: false,
@@ -74,7 +74,7 @@
title: '姹￠洦姘寸缃�',
isCollapse: true,
- selectGroup: true
+ selectGroup: false
}
},
computed: {},
@@ -116,13 +116,13 @@
case '姹℃煋婧�':
this.gcComp = DischargeSearch
break
- case '搴熸按鐩戞祴':
+ case '搴熸按':
this.gcComp = WaterWasteSearch
break
- case '搴熸皵鐩戞祴':
+ case '搴熸皵':
this.gcComp = GasWasteSearch
break
- case '鍥哄簾绠＄悊':
+ case '鍥哄簾':
this.gcComp = SolidWasteSearch
break
case '鐜椋庨櫓':
@@ -131,7 +131,7 @@
case '鍦熷￥鍙婂湴涓嬫按':
this.gcComp = SoilGroundWaterSearch
break
- case '姹￠洦姘寸缃�':
+ case '绠＄綉':
this.gcComp = SewersSearch
break
}
@@ -180,9 +180,32 @@
// speed: 1000
// })
// }
+ },
+ defaultLastOne () {
+ let v = {}
+ this.topicList.forEach((item) => {
+ if (item.isShow) {
+ v = item
+ }
+ })
+ this.selected(v)
}
},
mounted () {
+ const that = this
+ bus.$on('changeSearchBar', function (obj) {
+ // console.log(obj.checked, obj.name)
+ that.topicList.forEach((item) => {
+ if (item.name === obj.name) {
+ item.isShow = obj.checked
+ if (item.isShow) {
+ that.selected(item)
+ } else {
+ that.defaultLastOne()
+ }
+ }
+ })
+ })
}
}
</script>
@@ -199,7 +222,7 @@
.search-container {
position: relative;
width: 1.79167rem;
- /*height: 5.6475rem;*/
+ /* height: 5.6475rem;*/
overflow: hidden;
}
.module-wrap{
@@ -716,7 +739,7 @@
.panel-title{}
.search-panel{
background-color: transparent;
- padding: 10px 0;
+ padding: 10px;
border-bottom: 1px solid @background-color-split;
// .el-input{width:calc(100% - 40px);position: relative}
/deep/ input {
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 49707dd..bcf296e 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -15,42 +15,49 @@
name: '姹℃煋婧�',
id: 1,
check: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
- name: '搴熸按鐩戞祴',
+ name: '搴熸按',
id: 2,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
- name: '搴熸皵鐩戞祴',
+ name: '搴熸皵',
id: 3,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
- name: '鍥哄簾绠＄悊',
+ name: '鍥哄簾',
id: 4,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
name: '鐜椋庨櫓',
id: 5,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}, {
- name: '姹￠洦姘寸缃�',
+ name: '绠＄嚎',
id: 7,
checked: false,
+ isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
}]
--
Gitblit v1.8.0