From d54311dbd787d54876632026eec36497556ed57c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 15:33:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 27fb4bc..acee023 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,15 +6,14 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
-<!-- <GasECharts v-else></GasECharts>-->
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
<PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -23,18 +22,18 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ PublicTabs,
PublicTable,
- GasVideo,
- PublicChart
+ PublicChart,
+ PublicVideo
},
data () {
return {
@@ -46,14 +45,20 @@
},
methods: {
setData (dataBasic, dataDetailed, value) {
- // dataBasic.forEach(item => {
- // this.displayContentTitle = item.StoragePlaceName
- // })
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
this.displayContentTab = dataBasic
this.displayContentTable = dataDetailed
this.flag = true
this.value = value
},
+ setGasData (data, value) {
+ this.displayContentTitle = data.Name
+ this.displayContentTab = data
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
--
Gitblit v1.8.0