From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 9a379d9..7726783 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,15 +6,16 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value"
- :setWasteGasdata="setWasteGasdata"></PublicTabs>
+ <public-tabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></public-tabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
- <PublicChart v-else></PublicChart>
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
- <PublicVideo></PublicVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -43,11 +44,14 @@
displayContentTab: '',
displayContentTable: '',
flag: false,
- value: ''
+ value: '',
+ getWasteGasDetails: []
}
},
methods: {
setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
dataBasic.forEach(item => {
this.displayContentTitle = item.StoragePlaceName
})
@@ -56,8 +60,10 @@
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.flag = true
this.value = value
--
Gitblit v1.8.0