From 393b2243412842c293c6f633fc327f80bef55c98 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 19:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index c0b4e4f..c766b58 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,15 +7,11 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
+ <GasTabs></GasTabs>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
<GasECharts v-else></GasECharts>
</div>
-<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
- <GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
- <!-- <PublicTable></PublicTable>-->
-<!-- <GasECharts></GasECharts>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -31,14 +27,17 @@
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 GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
+ GasTabs,
GasTab,
PublicTable,
GasECharts,
+ // PublicTable,
+ // GasECharts,
GasVideo
},
data () {
--
Gitblit v1.8.0