From a25bd679d4a3e69f9ddbe49302b2d24224ab90f5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 14:46:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 2307d3f..5b88355 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,17 @@
<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">
- <GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
+<!-- <GasECharts v-else></GasECharts>-->
+ <PublicTab v-else></PublicTab>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -19,29 +22,36 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+// import GasTabs from './GasComponents/GasTabs'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import PublicTab from './GasComponents/PublicTab'
export default {
name: 'PublicBounced',
components: {
GasTab,
PublicTable,
- GasECharts,
- GasVideo
+ GasVideo,
+ PublicTab
},
data () {
return {
- displayContent: [],
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
flag: false
}
},
methods: {
- setData (data, value) {
- 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
},
@@ -54,10 +64,11 @@
<style lang="less" scoped>
.public-bounced {
+ width: 75%;
z-index: 999;
position: absolute;
- top: 50%;
- left: 50%;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
border: 1px #9fc5c8 solid;
@@ -82,14 +93,22 @@
}
.public-bounced-content {
+ margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
+ padding: 10px;
.public-bounced-content-left {
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
}
.public-bounced-content-right {
+ flex: 2;
+ //width: 48%;
+ height: 100%;
}
}
}
--
Gitblit v1.8.0