From 6ace815c16170b0a7fc68bf280f63bffe96612e6 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:24:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index e0f2cfe..8163759 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>
@@ -57,7 +57,6 @@
getWasteWaterMonitoringDetails: [],
getQueryOnlineMonData: [],
ManualData: []
- // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -83,12 +82,10 @@
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
--
Gitblit v1.8.0