From 9248255437aa54571da2ff80e8ca9b9e6152c61b Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 09 四月 2021 10:44:15 +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, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index e363527..5a43649 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,8 +14,9 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ </public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -38,7 +39,7 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts
+ // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -55,7 +56,7 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getWasteWaterMonitoring: []
+ getQueryOnlineMonData: []
}
},
methods: {
@@ -81,10 +82,10 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, drawData, value) {
+ setWaterData (dataWater, dataDetail, hourData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoring = drawData
+ this.getQueryOnlineMonData = hourData
// console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
--
Gitblit v1.8.0