From 4e8b552c7e79058e4b009aaeaacba403c8a1f2e5 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 16 四月 2021 10:41:07 +0800
Subject: [PATCH] 废气点点击弹窗偏移
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 12 +
src/components/LayerController/logic/WasteGas.js | 3
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 23 +
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 392 ++++++++++++++++++++++++++++++++
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 279 +++++++++++-----------
5 files changed, 559 insertions(+), 150 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index dc58543..d22a3ce 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -57,6 +57,7 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
@@ -150,6 +151,17 @@
this.onSubmit()
},
methods: {
+ async getWasteGasMonData () {
+ const GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const data = await mapApi.getWasteGasMonData(GasOnlinedata)
+ this.JsonDayCharts = data
+ },
onSubmit () {
console.log('submit!')
this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 9d30887..c23fb93 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -37,7 +37,7 @@
center
v-dialogDrag
>
- <div class="el-dialog-div" style="height: 500px">
+ <div class="el-dialog-div">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
@@ -45,6 +45,7 @@
</template>
<script>
+// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
export default {
@@ -517,6 +518,395 @@
// createDivByMouse("s",params.event);
}) */
}
+ // 搴熸皵鎸夊ぉ鏌ヨ灏忔椂鏁版嵁
+ // queryZDYDate_24 (id) {
+ // this.formInline.timeStart
+ // this.formInline.timeEnd
+ // // var date = $('#riqi_24').val()
+ // // if (date) {
+ // // var date1 = new Date(date)
+ // // date1 = new Date(date1.getTime() - (8 * 3600000))
+ // // console(date1)
+ // // var dateUtil = new DateUtil()
+ // // var datePkg = dateUtil.getTowDate(date1, 'a', 24 * 3600000 - 1)
+ // // var dateTime1FullStr =
+ // var datatype = 2
+ // console(datePkg)
+ //
+ // if (CFG_Model.production) {
+ // get24HourDate(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31,226', function (res) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ // var dateList = [] // 瀛樻斁鏃堕棿
+ // var dataList = [] // 瀛樻斁鏁版嵁
+ // var bzh = [] // 鏍囧噯鍊�
+ // var data = []
+ // wrwIDS = []
+ // for (var i = 0; i < d.length; i++) {
+ // var MonTimeStr = d[i].MonTimeStr
+ //
+ // // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ //
+ // var strDate
+ // var d1 = MonTimeStr.split('/')
+ // var d2 = d1[2].split(' ')
+ // var t = MonTimeStr.split(' ')
+ // var hlist = t[1].split(':')
+ // var h = hlist[0]
+ // if (d1[1] > 9) {
+ // // strDate=MonTimeStr.substring(8,10)+"鏃�";
+ // if (d2[0] > 9) {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(11, 13) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(11, 12) + '鏃�'
+ // }
+ // } else {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // }
+ // } else {
+ // if (d2[0] > 9) {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // } else {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(9, 11) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(9, 10) + '鏃�'
+ // }
+ // }
+ // }
+ //
+ // if (nameList.length == 0) {
+ // nameList.push(d[i].PoltmtrlName.trim())
+ // dateList.push(strDate)
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // bzh.push(d[i].StdValue)
+ // } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ // nameList.push(d[i].PoltmtrlName)
+ // bzh.push(d[i].StdValue)
+ // dataList.push(data)
+ // data = new Array()
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // } else if (i == d.length - 1) {
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // dataList.push(data)
+ // } else {
+ // if (dateList.indexOf(strDate) < 0) {
+ // dateList.push(strDate)
+ // }
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // }
+ // }
+ // // 澶勭悊鏁版嵁缁撴潫
+ //
+ // // dateList=get24DateTime();
+ //
+ // var newList = []
+ // for (var i = 0; i < dataList.length; i++) {
+ // var list = dataList[i].reverse()
+ // newList.push(list)
+ // }
+ // dataList = newList
+ //
+ // var id = 'mychart'
+ // var title = '鍔犵儹鐐夌儫姘�'
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] == '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] == '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] == '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] == '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] == '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] == '搴熸皵' || nameList[l] == '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // var legend = lengList
+ // var xdata = dateList.reverse()
+ // var ydatas = []
+ //
+ // for (var j = 0; j < nameList.length; j++) {
+ // var zdcbcolor, zxcolor
+ // if (nameList[j] == '浜屾哀鍖栫～') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#fff21c'
+ // } else if (nameList[j] == '姘哀鍖栫墿') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#00B0F0'
+ // } else if (nameList[j] == '鐑熷皹') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#f48183'
+ // } else if (nameList[j] == '娓╁害') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#F206FF'
+ // } else {
+ // zdcbcolor = 'red'
+ // zxcolor = '#9ACD32'
+ // }
+ // var ydata = {
+ // name: nameList[j],
+ // data: dataList[j],
+ // zdcbcolor: zdcbcolor,
+ // zxcolor: zxcolor,
+ // bzz: bzh[j]
+ // }
+ // exhbzz = {
+ // name: nameList[j],
+ // bzhui: bzh[j]
+ // }
+ // exhbzzList.push(exhbzz)
+ //
+ // ydatas.push(ydata)
+ // }
+ //
+ // var yname = '娴撳害(mg/m鲁)'
+ // CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // console.log(123323)
+ // console.log(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // })
+ // } else {
+ // get24HourDate1(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31', function (res) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ // var dateList = [] // 瀛樻斁鏃堕棿
+ // var dataList = [] // 瀛樻斁鏁版嵁
+ // var bzh = [] // 鏍囧噯鍊�
+ // var data = []
+ // wrwIDS = []
+ // for (var i = 0; i < d.length; i++) {
+ // var MonTimeStr = d[i].MonTimeStr
+ //
+ // // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ //
+ // var strDate
+ // var d1 = MonTimeStr.split('/')
+ // var t = MonTimeStr.split(' ')
+ // var hlist = t[1].split(':')
+ // var h = hlist[0]
+ // if (d1[1] > 9) {
+ // // strDate=MonTimeStr.substring(8,10)+"鏃�";
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(11, 13) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(11, 12) + '鏃�'
+ // }
+ // } else {
+ // // strDate=MonTimeStr.substring(7,9)+"鏃�";
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // }
+ //
+ // if (nameList.length == 0) {
+ // nameList.push(d[i].PoltmtrlName.trim())
+ // dateList.push(strDate)
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // bzh.push(d[i].StdValue)
+ // } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ // nameList.push(d[i].PoltmtrlName)
+ // bzh.push(d[i].StdValue)
+ // dataList.push(data)
+ // data = new Array()
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // } else if (i == d.length - 1) {
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // dataList.push(data)
+ // } else {
+ // if (dateList.indexOf(strDate) < 0) {
+ // dateList.push(strDate)
+ // }
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // }
+ // }
+ // // 澶勭悊鏁版嵁缁撴潫
+ //
+ // dateList = get24DateTime()
+ // dateList.reverse()
+ // var newList = []
+ //
+ // for (var i = 0; i < dataList.length; i++) {
+ // var list = dataList[i].reverse()
+ // newList.push(list)
+ // }
+ // dataList = newList
+ //
+ // var id = 'mychart'
+ // var title = '鍔犵儹鐐夌儫姘�'
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] == '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] == '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] == '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] == '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] == '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] == '搴熸皵' || nameList[l] == '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // var legend = lengList
+ // var xdata = dateList.reverse()
+ // var ydatas = []
+ //
+ // for (var j = 0; j < nameList.length; j++) {
+ // var zdcbcolor, zxcolor
+ // if (nameList[j] == '浜屾哀鍖栫～') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#fff21c'
+ // } else if (nameList[j] == '姘哀鍖栫墿') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#00B0F0'
+ // } else if (nameList[j] == '鐑熷皹') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#f48183'
+ // } else if (nameList[j] == '娓╁害') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#F206FF'
+ // } else {
+ // zdcbcolor = 'red'
+ // zxcolor = '#9ACD32'
+ // }
+ // var ydata = {
+ // name: nameList[j],
+ // data: dataList[j],
+ // zdcbcolor: zdcbcolor,
+ // zxcolor: zxcolor,
+ // bzz: bzh[j]
+ // }
+ // exhbzz = {
+ // name: nameList[j],
+ // bzhui: bzh[j]
+ // }
+ // exhbzzList.push(exhbzz)
+ // ydatas.push(ydata)
+ // }
+ //
+ // var yname = '娴撳害(mg/m鲁)'
+ // CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // onsole.log(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // })
+ // }
+ // $('.btm span:nth-child(2)').empty()
+ // var html = '鐩戞祴鏃堕棿 锛�' + datePkg.dateTime1FullStr + ' 鑷� ' + datePkg.dateTime2FullStr + '锛�'
+ // $('.btm span:nth-child(2)').html(html)
+ //
+ // fore24Time = datePkg.dateTime1FullStr
+ // back24Time = datePkg.dateTime2FullStr
+ // } else {
+ // alert('鏌ヨ鏃堕棿涓嶈兘涓虹┖锛�')
+ // }
+ // }
// drawChart: function () {
// window.onresize = function () {
// var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 61a58f1..2be904a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -835,6 +835,7 @@
}
console.log(option)
this.RealTimeChart.setOption(option)
+ // this.IntervalEXHRealTimeDate()
// this.RealTimeChart.on('legendselectchanged', function (params) {
// var StdVal = null
@@ -860,153 +861,153 @@
// var nowDate = new Date().Format()
// })
},
- getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
- if (this.res.length > 0) {
- // 澶勭悊鏁版嵁寮�濮�
- var d = res
- var nameList = [] // 瀛樻斁鍥句緥
-
- var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
- var datalist // 瀛樻斁data鐨勬暟缁�
- // var bzh = []
- for (var i = 0; i < d.length; i++) {
- if (d[i].ErrorMessage != null) {
- continue
- }
- // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
-
- if (nameList.length === 0) {
- nameList.push(name)
-
- var newdate = new Date(this.res.ReadTime)
- data = {
- name: name,
- value: [newdate, this.res.TagValue]
- }
-
- datalist = {
- name: name,
- data: [data]
- }
-
- this.EXHRealTimeDataList.push(datalist)
- } else if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- // var newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- this.EXHRealTimeDataList.push(datalist)
- } else if (i === d.length - 1) {
- if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- // var newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- // EXHRealTimeDataList.push(datalist)
- } else {
- // var newdate = new Date(d[i].ReadTime)
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[k].data.push(data)
- }
- }
- }
- } else {
- const newdate = new Date(d[i].ReadTime)
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[k].data.push(data)
- }
- }
- }
- }
-
- // var divid = 'mychart_ss'
- // var title = name
- var lengList = []
- var objTemp
-
- for (var l = 0; l < nameList.length; l++) {
- var obj
- var iconurl
- if (nameList[l] === '浜屾哀鍖栫～') {
- iconurl = 'image://../assets/imgs/legend/SO2.png'
- } else if (nameList[l] === '姘哀鍖栫墿') {
- iconurl = 'image://../assets/imgs/legend/NOX.png'
- } else if (nameList[l] === '鐑熷皹') {
- iconurl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
- iconurl = 'image://../assets/imgs/legend/grn.png'
- } else if (nameList[l] === '娓╁害') {
- iconurl = 'image://../assets/imgs/legend/WenDu.png'
- } else {
- iconurl = 'image://../assets/imgs/legend/VOCs.png'
- }
-
- if (nameList[l] === '搴熸皵' || nameList[l] === '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
- objTemp = {
- name: nameList[l],
- icon: iconurl,
- textStyle: {
- color: '#ccc'
- },
- itemWidth: 20,
- itemHeight: 5
- }
- } else {
- obj = {
- name: nameList[l],
- icon: iconurl,
- textStyle: {
- color: '#ccc'
- },
- itemWidth: 20,
- itemHeight: 5
- }
- lengList.push(obj)
- }
- }
- lengList.push(objTemp)
-
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- }
- },
+ // getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+ // if (this.res.length > 0) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ //
+ // var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
+ // var datalist // 瀛樻斁data鐨勬暟缁�
+ // // var bzh = []
+ // for (var i = 0; i < d.length; i++) {
+ // if (d[i].ErrorMessage != null) {
+ // continue
+ // }
+ // // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
+ //
+ // if (nameList.length === 0) {
+ // nameList.push(name)
+ //
+ // var newdate = new Date(this.res.ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, this.res.TagValue]
+ // }
+ //
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ //
+ // this.EXHRealTimeDataList.push(datalist)
+ // } else if (nameList.indexOf(name) < 0) {
+ // nameList.push(name)
+ //
+ // // var newdate = new Date(d[i].ReadTime)
+ //
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ // this.EXHRealTimeDataList.push(datalist)
+ // } else if (i === d.length - 1) {
+ // if (nameList.indexOf(name) < 0) {
+ // nameList.push(name)
+ //
+ // // var newdate = new Date(d[i].ReadTime)
+ //
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ // // EXHRealTimeDataList.push(datalist)
+ // } else {
+ // // var newdate = new Date(d[i].ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[k].data.push(data)
+ // }
+ // }
+ // }
+ // } else {
+ // const newdate = new Date(d[i].ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[k].data.push(data)
+ // }
+ // }
+ // }
+ // }
+ //
+ // // var divid = 'mychart_ss'
+ // // var title = name
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] === '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] === '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] === '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] === '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] === '搴熸皵' || nameList[l] === '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ // }
+ // },
// 閽╁瓙璋冪敤瀹炴椂
- IntervalEXHRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
+ IntervalEXHRealTimeDate () {
// 瀹氭椂鍣ㄥ嚱鏁�
- this.interValHander = setInterval(function () {
+ this.DrawEXHRealTimeDateChart()
+ setInterval(function () {
// $('.RealTime').empty()
this.startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.step = '15'
// this.getRtdb15s(this.unionTagCodeList, this.startTime, this.endTime, this.step, this.res)
// PreQueryTime=endTime;
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
+ this.IntervalEXHRealTimeDate()
}, 15000)
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 11f39fd..98eba0a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="400px" border>
+ <el-table :data="tableData" max-height="500px" border>
<el-scrollbar style="height: 50vh">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
@@ -31,6 +31,7 @@
</template>
<script>
+// import mapApi from '@/api/mapApi'
export default {
name: 'PublicDetailedList',
data () {
@@ -38,16 +39,20 @@
tableData: []
}
},
- mounted () {
+ created () {
// console.log(this.$attrs.value)
- if (this.$attrs.value === 'feiqi') {
- this.tableData = this.$attrs.getWasteGasDetails
- // console.log(this.$attrs.getWasteGasDetails)
- } else if (this.$attrs.value === 'feishui') {
- this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- // console.log(this.$attrs.getWasteWaterMonitoringDetails)
- }
+ this.tableData = this.$attrs.getWasteGasDetails
+ // this.getWasteGasDetails()
+ // console.log(this.tableData)
+ // console.log(this.$attrs.getWasteGasDetails)
}
+ // methods: {
+ // async getWasteGasDetails () {
+ // const data = await mapApi.getWasteGasDetails
+ // this.tableData = data
+ // console.log(this.tableData)
+ // }
+ // }
}
</script>
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bb5e353..022588c 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -87,7 +87,8 @@
instance.$mount()
document.body.appendChild(instance.$el)
instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
- this.setPanTo(e.latlng, 80)
+ this.setPanTo(e.latlng, 150)
+ console.log(e.latlng)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
--
Gitblit v1.8.0