From 087cfed8ff5af06f5686b9d772bb71471102abe3 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:39:49 +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, 6 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 140187c..91fa74f 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -8,8 +8,8 @@
<div class="public-bounced-content-left">
<GasTab :displayContentTab="displayContentTab"></GasTab>
<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>
+ <GasTabs v-else></GasTabs>
</div>
</div>
<div class="public-bounced-content-right">
@@ -22,18 +22,17 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-// import GasTabs from './GasComponents/GasTabs'
+import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
+ GasTabs,
GasTab,
PublicTable,
- GasECharts,
GasVideo
},
data () {
--
Gitblit v1.8.0