From c92dd3fca165ddd8d73d29a640ec22c89c45260f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 15:38:53 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fbc8c8c..8756e92 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,7 +7,8 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
- <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <PublicTable></PublicTable>
<!-- <GasECharts v-else></GasECharts>-->
</div>
<div class="public-bounced-content-right">
@@ -21,7 +22,7 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
@@ -29,7 +30,7 @@
name: 'PublicBounced',
components: {
GasTab,
- // PublicTable,
+ PublicTable,
// GasECharts,
GasVideo
},
@@ -85,16 +86,19 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
+ padding: 10px;
.public-bounced-content-left {
- width: 48%;
+ flex: 3;
height: 100%;
+ margin-right: 10px;
}
.public-bounced-content-right {
- width: 48%;
+ flex: 2;
+ //width: 48%;
height: 100%;
}
}
--
Gitblit v1.8.0