From 300e019d85ab8d8a671a6b7773997e40fff56d58 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期三, 31 三月 2021 16:21:24 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/BaseNav/PublicBounced/PublicBounced.vue | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index ff6bfb2..3d0c162 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -7,10 +7,10 @@ <div class="public-bounced-content"> <div class="public-bounced-content-left"> <GasTab :displayContent="displayContent"></GasTab> - <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable> - <GasECharts v-else></GasECharts> - <!-- <PublicTable></PublicTable>--> - <!-- <GasECharts></GasECharts>--> + <div class="public-bounced-content-left-bottom"> + <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable> + <GasECharts v-else></GasECharts> + </div> </div> <div class="public-bounced-content-right"> <GasVideo></GasVideo> @@ -95,7 +95,6 @@ .public-bounced-content { margin: 15px auto; display: flex; - //align-items: center; justify-content: space-around; padding: 10px; @@ -107,7 +106,6 @@ .public-bounced-content-right { flex: 2; - //width: 48%; height: 100%; } } -- Gitblit v1.8.0