From 1b09fe890938f123fbcccf235620384b7cd9b721 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 30 三月 2021 17:36:31 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index eddeb78..275b86e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,8 +6,9 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTable :displayContent="displayContent"></GasTable>
- <GasECharts></GasECharts>
+ <GasTab :displayContent="displayContent"></GasTab>
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <GasECharts v-else></GasECharts>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -19,14 +20,16 @@
<script>
import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+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'
export default {
name: 'PublicBounced',
components: {
- GasTable,
+ GasTab,
+ PublicTable,
GasECharts,
GasVideo
},
@@ -37,9 +40,10 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
this.displayContent = data
this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -51,7 +55,7 @@
<style lang="less" scoped>
.public-bounced {
z-index: 999;
- position: fixed;
+ position: absolute;
top: 50%;
left: 50%;
background-color: #002432;
@@ -90,4 +94,4 @@
}
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0