From e2617bb02680f0755824cab9235f142b3e1ac708 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 09:59:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d3e18d3..b221e49 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,7 +15,8 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+>
</public-chart>
</div>
</div>
@@ -39,7 +40,7 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts
+ // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -57,6 +58,7 @@
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -74,15 +76,16 @@
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
},
- setWaterData (dataWater, dataDetail, hourData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
this.getQueryOnlineMonData = hourData
--
Gitblit v1.8.0