From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5848dc0..892cbad 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,17 +1,16 @@
<template>
<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>
-<!-- <div class="public-bounced-content-left-bottom">-->
- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
-<!-- <GasECharts v-else></GasECharts>-->
- <GasTabs v-else></GasTabs>
-<!-- </div>-->
+ <GasTab :displayContentTab="displayContentTab" ></GasTab>
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -25,35 +24,34 @@
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 GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-import GasTabs from './GasComponents/GasTabs'
+// import GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
- GasTabs,
GasTab,
PublicTable,
- // GasECharts,
- // PublicTable,
- // GasECharts,
+ GasECharts,
GasVideo
},
data () {
return {
- displayContent: [],
+ displayContentTitle: '',
+ displayContentTab: '',
flag: false
}
},
methods: {
setData (data, value) {
- console.log(data)
- console.log(value)
- this.displayContent = data
+ // data.forEach((item, index) => {
+ // // console.log(item.StoragePlaceName)
+ // // this.displayContentTitle = item.StoragePlaceName
+ // })
+ this.displayContentTab = data
this.flag = true
this.value = value
- console.log(this.flag)
},
closePopup () {
this.flag = false
--
Gitblit v1.8.0