From be9f3ad87b059e5ddf25a7f8f8672293aecf6302 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 14:32:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7e79e8c..1aaf67c 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -11,7 +11,7 @@
<div class="public-bounced-content-left-bottom">
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
- <public-chart v-else :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -71,13 +71,13 @@
this.flag = true
this.value = value
},
- setWaterData (data, dataDetail, drawData, value) {
- this.setWasteWaterdata = data
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
// console.log(data)
this.getWasteWaterMonitoring = drawData
console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
- this.displayContentTitle = data.Name
+ this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
},
--
Gitblit v1.8.0