From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 299 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 153 insertions(+), 146 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 60cee1d..2be904a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -36,9 +36,7 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:1.5rem;" >
- <div style="width:100%;height:100%;" ref="echarts"> </div>
- </div>
+ <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
</div>
</div>
</template>
@@ -561,15 +559,17 @@
step: ''
}
},
+ updated () {
+ this.DrawEXHRealTimeDateChart()
+ },
mounted () {
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
- 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.JSONTimeData.BBZMAPPING)
},
methods: {
onSubmit () {
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ this.DrawEXHRealTimeDateChart()
},
/**
* RTDB 鏍煎紡杞崲
@@ -591,7 +591,12 @@
// return dataArray
// },
// 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
- DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ DrawEXHRealTimeDateChart () {
+ // var id = this.JsonTimeCtarts.id
+ // var title = this.JsonTimeCtarts.title
+ var legend = this.JsonTimeCtarts.legend
+ var ydatas = this.JsonTimeCtarts.ydatas
+ var yname = this.JsonTimeCtarts.yname
this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
// this.myChart.clear()
var serLists = []
@@ -806,7 +811,7 @@
}
}, { // 娴侀噺杞�
type: 'value',
- name: '娴侀噺(m3/h)',
+ name: '搴熸皵娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
@@ -830,6 +835,7 @@
}
console.log(option)
this.RealTimeChart.setOption(option)
+ // this.IntervalEXHRealTimeDate()
// this.RealTimeChart.on('legendselectchanged', function (params) {
// var StdVal = null
@@ -855,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)
}
}
@@ -1062,6 +1068,7 @@
padding: 0;
border-color:#00fff6;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0