From 5f98655fb83417d58a1ec0b88eec3900fc15dcce Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 29294dc..c751820 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,9 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTable></GasTable>
- <GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
+ <GasTab :displayContent="displayContent"></GasTab>
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -19,17 +19,17 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+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/GasVideo'
-// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
- // GasTabs,
- GasTable,
+ GasTab,
+ PublicTable,
GasECharts,
GasVideo
},
@@ -40,9 +40,10 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
this.displayContent = data
this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -53,18 +54,15 @@
<style lang="less" scoped>
.public-bounced {
- width: 80%;
- height: 450px;
+ width: 75%;
z-index: 999;
position: absolute;
- top: 25%;
- left: 10%;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
- margin: 1% auto;
border: 1px #9fc5c8 solid;
.public-bounced-title {
- width: 100%;
border: 1px #a4c0d8 solid;
display: flex;
align-items: center;
@@ -85,21 +83,19 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
+ margin: 15px auto;
display: flex;
- //align-items: center;
+ align-items: center;
justify-content: space-around;
.public-bounced-content-left {
- //flex: 1;
width: 48%;
- height: 400px;
+ height: 100%;
}
.public-bounced-content-right {
width: 48%;
- height: 400px;
+ height: 100%;
}
}
--
Gitblit v1.8.0