From 65113eae10994702a740a79e7461539d7bcbba08 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 19:02:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 1e15ccf..c766b58 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,6 +7,7 @@
<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>
@@ -26,13 +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'
export default {
name: 'PublicBounced',
components: {
+ GasTabs,
GasTab,
PublicTable,
GasECharts,
+ // PublicTable,
+ // GasECharts,
GasVideo
},
data () {
@@ -95,6 +100,7 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
+ //align-items: center;
justify-content: space-around;
padding: 10px;
@@ -106,6 +112,7 @@
.public-bounced-content-right {
flex: 2;
+ //width: 48%;
height: 100%;
}
}
--
Gitblit v1.8.0