From 8bb5942235c86ea771c4215a77c46b1245c30a93 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:31:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 32b73d1..9d03215 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -56,8 +56,8 @@
       value: '',
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
-      getQueryOnlineMonHourData: [],
-      getQueryOnlineMonDateData: []
+      getQueryOnlineMonData: []
+      // getGasQueryOnlineMonData: []
     }
   },
   methods: {
@@ -75,10 +75,11 @@
       this.flag = true
       this.value = value
     },
-    setGasData (data, dataDetails, value) {
+    setGasData (data, dataDetails, GasHourData, value) {
       this.setWasteGasdata = data
       this.getWasteGasDetails = dataDetails
-      // console.log(dataDetails)
+      this.getQueryOnlineMonData = GasHourData
+      console.log(this.getQueryOnlineMonData)
       this.displayContentTitle = data.Name
       this.flag = true
       this.value = value
@@ -86,12 +87,9 @@
     setWaterData (dataWater, dataDetail, hourData, dateData, value) {
       this.setWasteWaterdata = dataWater
       // console.log(data)
-      this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
-      // console.log(dataDetail)
-      this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
+      this.getQueryOnlineMonData = hourData
       // console.log(drawData)
-      this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
-      // console.log(dateData)
+      this.getWasteWaterMonitoringDetails = dataDetail
       this.displayContentTitle = dataWater.Name
       this.flag = true
       this.value = value

--
Gitblit v1.8.0