From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:21:27 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index f0b58c2..501d120 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,17 +1,20 @@
<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'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></PublicTabs>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
+ <PublicChart :getWasteGasDetails="getWasteGasDetails" v-else></PublicChart>
+ </div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -20,28 +23,45 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
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 PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ PublicTabs,
PublicTable,
- GasECharts,
- GasVideo
+ PublicChart,
+ PublicVideo
},
data () {
return {
- displayContent: [],
- flag: false
+ setWasteGasdata: '',
+ displayContentTitle: '',
+ displayContentTab: '',
+ displayContentTable: '',
+ flag: false,
+ value: '',
+ getWasteGasDetails: []
}
},
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
+ },
+ setGasData (data, dataDetails, value) {
+ this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
+ this.displayContentTitle = data.Name
this.flag = true
this.value = value
},
--
Gitblit v1.8.0