From b9e11f18c961df43f632b85c04cd730bde21fc76 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 13:10:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 82839fc..2ab8d04 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -21,7 +21,7 @@
</public-chart>
</div>
</div>
- <div class="public-bounced-content-right" >
+ <div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
@@ -59,8 +59,9 @@
ManualData: []
}
},
- beforeUpdate () {
- this.$refs.PublicChart.$refs.Echats.CreateChart()
+ destoryed () {
+ this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+ this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
},
methods: {
closePopup () {
@@ -75,22 +76,20 @@
this.displayContentTable = dataDetailed[0]
},
setGasData (data, dataDetails, GasHourData, ManualData, value) {
- // console.log(this.$refs)
+ // console.log(data, dataDetails, GasHourData, ManualData, value)
this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
this.ManualData = ManualData
// console.log(this.getQueryOnlineMonData)
- this.displayContentTitle = data.Name
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+ setWaterData (dataWater, detailData, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
- // console.log(data)
this.getQueryOnlineMonData = hourData
- // console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getWasteWaterMonitoringDetails = detailData
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -133,7 +132,7 @@
}
.public-bounced-content {
- padding: 0.1rem;
+ padding: 0.05rem;
display: flex;
//align-items: center;
//justify-content: space-around;
--
Gitblit v1.8.0