From 087cfed8ff5af06f5686b9d772bb71471102abe3 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:39:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 0522449..91fa74f 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,13 +1,16 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" v-draw v-if="flag">
<div class="public-bounced-title">
- <span>{{ displayContent.Name }}</span>
+ <span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTable></GasTable>
- <GasECharts></GasECharts>
+ <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <GasTabs v-else></GasTabs>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -18,28 +21,37 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
- GasTable,
- GasECharts,
+ GasTabs,
+ GasTab,
+ PublicTable,
GasVideo
},
data () {
return {
- displayContent: [],
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
flag: false
}
},
methods: {
- setData (data) {
- this.displayContent = data
+ setData (dataBasic, dataDetailed, value) {
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -50,18 +62,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;
@@ -82,22 +91,23 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
+ margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
+ padding: 10px;
.public-bounced-content-left {
- width: 48%;
- height: 400px;
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
}
.public-bounced-content-right {
- width: 48%;
- height: 400px;
+ flex: 2;
+ //width: 48%;
+ height: 100%;
}
}
-
}
</style>
--
Gitblit v1.8.0