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 | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index c32bc19..b221e49 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,9 +14,9 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
- :getQueryOnlineMonHourData="getQueryOnlineMonHourData"
- :getQueryOnlineMonDateData="getQueryOnlineMonDateData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+>
</public-chart>
</div>
</div>
@@ -40,7 +40,7 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts
+ // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -57,8 +57,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonHourData: [],
- getQueryOnlineMonDateData: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -76,10 +76,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
@@ -87,12 +88,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