From 30e9bcbb74e210146b114aea7c530e5b09f3c0d4 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 19:08:48 +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, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ce04e0a..8ccfd54 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -61,6 +61,7 @@
   },
   destoryed () {
     this.$refs.PublicChart.$refs.Echats.CreateChart()
+    this.$refs.PublicChart.$refs.Echats.effChartShow()
   },
   methods: {
     closePopup () {
@@ -85,12 +86,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
@@ -103,7 +102,7 @@
 .public-bounced {
   z-index: 2000;
   position: absolute;
-  top: 15%;
+  top: 35%;
   left: 20%;
 
   .public-bounced-title {

--
Gitblit v1.8.0