From c3f7ab6bbaf26298d2d53f5422b8281a335752b7 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 11:38:41 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 850980d..7726783 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,17 +1,21 @@
<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 :displayContent="displayContent"></GasTable>
- <GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
+ <public-tabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></public-tabs>
+ <div class="public-bounced-content-left-bottom">
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"></public-chart>
+ </div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -19,30 +23,50 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
+import '@/components/BaseNav/SolidWaste/directive/dir'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- // GasTabs,
- GasTable,
- GasECharts,
- GasVideo
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
},
data () {
return {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: []
}
},
methods: {
- setData (data) {
- this.displayContent = data
+ setData (dataBasic, dataDetailed, value) {
this.flag = true
+ this.value = value
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
+ this.flag = true
+ this.value = value
+ },
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
},
closePopup () {
this.flag = false
@@ -53,12 +77,12 @@
<style lang="less" scoped>
.public-bounced {
+ width: 75%;
z-index: 999;
- position: fixed;
- top: 50%;
- left: 50%;
+ position: absolute;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
- margin: 1% auto;
border: 1px #9fc5c8 solid;
.public-bounced-title {
@@ -82,17 +106,23 @@
}
.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%;
}
}
-
}
</style>
--
Gitblit v1.8.0