From 6f6696463e911e92c9fa9f4e27bfb788768c5f3f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 06 四月 2021 18:05:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8d54ed9..41a96c1 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,20 +1,21 @@
<template>
- <div class="public-bounced" v-if="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'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
- <GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
- <!-- <PublicTable></PublicTable>-->
-<!-- <GasECharts></GasECharts>-->
+ <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></public-chart>
+ </div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -23,41 +24,45 @@
<script>
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'
-// import GasTabs from './GasComponents/GasTabs'
+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,
- GasTab,
- // PublicTable,
- GasECharts,
- GasVideo
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
},
data () {
return {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: ''
}
},
methods: {
- setData (data, value) {
- console.log(data)
- console.log(value)
- this.displayContent = data
+ setData (dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
- console.log(this.flag)
+ dataBasic.forEach(item => {
+ this.displayContentTitle = item.StoragePlaceName
+ })
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
},
- // setData (data) {
- // this.displayContent = data
- // this.flag = true
- // // this.value = value
- // },
+ setGasData (data, value) {
+ this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
@@ -98,20 +103,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;
+ //width: 64%;
+ //height: 100%;
+ //margin-right: 10px;
}
.public-bounced-content-right {
flex: 2;
- //width: 48%;
- height: 100%;
+ margin-left: 10px;
+ //width: 34%;
+ //height: 100%;
}
}
}
--
Gitblit v1.8.0