From 270f4c72b8566400fe29f78099f5e206908ef501 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:52:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 584a661..d64fe00 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,6 +14,7 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
>
@@ -57,8 +58,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
- // getGasQueryOnlineMonData: []
+ getQueryOnlineMonHourData: [],
+ getQueryOnlineMonDateData: []
}
},
methods: {
@@ -85,12 +86,15 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getQueryOnlineMonData = hourData
+ this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
+ // console.log(dataDetail)
+ this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
// console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
+ // console.log(dateData)
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
--
Gitblit v1.8.0