From b5acea8ed42d534cefa34d90f9eb1cd637dfe6d7 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 09:11:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ed22e56..0085f00 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -5,18 +5,34 @@
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
- <div class="public-bounced-content-left"></div>
- <div class="public-bounced-content-right"></div>
+ <div class="public-bounced-content-left">
+ <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>
+ </div>
</div>
</div>
</template>
<script>
-import '@/components/BaseNav/SolidWaste/directive'
+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'
export default {
name: 'PublicBounced',
+ components: {
+ GasTab,
+ PublicTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
@@ -24,9 +40,10 @@
}
},
methods: {
- setData (data) {
+ setData (data, value) {
this.displayContent = data
this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -37,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;
@@ -69,22 +83,20 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
+ margin: 15px auto;
display: flex;
align-items: center;
justify-content: space-around;
+
.public-bounced-content-left {
width: 48%;
- height: 400px;
- border: 1px red solid;
+ height: 100%;
}
+
.public-bounced-content-right {
width: 48%;
- height: 400px;
- border: 1px red solid;
+ height: 100%;
}
}
-
}
</style>
--
Gitblit v1.8.0