From 2e63f4c1d44e18283f48834cf1d4bc215ffafed3 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 16:30:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7324412..7ef971b 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,10 +6,10 @@
</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>
- <GasTabs v-else></GasTabs>
+ <PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -25,18 +25,19 @@
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTabs,
PublicTabs,
PublicTable,
+ PublicChart,
PublicVideo
},
data () {
return {
+ setWasteGasdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
@@ -55,8 +56,8 @@
this.value = value
},
setGasData (data, value) {
+ this.setWasteGasdata = data
this.displayContentTitle = data.Name
- this.displayContentTab = data
this.flag = true
this.value = value
},
--
Gitblit v1.8.0