From 4f5bbd0d4c9fd95d8065db8e3a3fb10e0ab4f5df Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:26:14 +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, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 501d120..d908a07 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 :getWasteGasDetails="getWasteGasDetails" v-else></PublicChart>
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
- <PublicVideo></PublicVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -49,6 +50,8 @@
},
methods: {
setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
dataBasic.forEach(item => {
this.displayContentTitle = item.StoragePlaceName
})
--
Gitblit v1.8.0