From 725201fe7dc72061c7a19c1ebb5f3c56f78da02e Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:10:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index acee023..501d120 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,10 +6,11 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <PublicChart v-else></PublicChart>
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
+ <PublicChart :getWasteGasDetails="getWasteGasDetails" v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -37,10 +38,13 @@
},
data () {
return {
+ setWasteGasdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
- flag: false
+ flag: false,
+ value: '',
+ getWasteGasDetails: []
}
},
methods: {
@@ -53,9 +57,11 @@
this.flag = true
this.value = value
},
- setGasData (data, value) {
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
this.displayContentTitle = data.Name
- this.displayContentTab = data
this.flag = true
this.value = value
},
--
Gitblit v1.8.0