From a25bd679d4a3e69f9ddbe49302b2d24224ab90f5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 14:46:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 892cbad..5b88355 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">
- <GasTab :displayContentTab="displayContentTab" ></GasTab>
+ <GasTab :displayContentTab="displayContentTab"></GasTab>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
+<!-- <GasECharts v-else></GasECharts>-->
+ <PublicTab v-else></PublicTab>
</div>
</div>
<div class="public-bounced-content-right">
@@ -22,34 +23,35 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
// import GasTabs from './GasComponents/GasTabs'
+import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import PublicTab from './GasComponents/PublicTab'
export default {
name: 'PublicBounced',
components: {
GasTab,
PublicTable,
- GasECharts,
- GasVideo
+ GasVideo,
+ PublicTab
},
data () {
return {
displayContentTitle: '',
displayContentTab: '',
+ displayContentTable: '',
flag: false
}
},
methods: {
- setData (data, value) {
- // data.forEach((item, index) => {
- // // console.log(item.StoragePlaceName)
- // // this.displayContentTitle = item.StoragePlaceName
- // })
- this.displayContentTab = data
+ setData (dataBasic, dataDetailed, value) {
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
this.flag = true
this.value = value
},
--
Gitblit v1.8.0