From 9b4688d253fe2ab54868ba10ff5bd89051971d0c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 09:54:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 1e15ccf..07a38cf 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,14 @@
<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>
+ <GasTab :displayContentTab="displayContentTab" ></GasTab>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
<GasECharts v-else></GasECharts>
</div>
</div>
@@ -26,6 +26,7 @@
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'
export default {
name: 'PublicBounced',
@@ -37,24 +38,21 @@
},
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)
},
- // setData (data) {
- // this.displayContent = data
- // this.flag = true
- // // this.value = value
- // },
closePopup () {
this.flag = false
}
@@ -95,6 +93,7 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
+ //align-items: center;
justify-content: space-around;
padding: 10px;
@@ -106,6 +105,7 @@
.public-bounced-content-right {
flex: 2;
+ //width: 48%;
height: 100%;
}
}
--
Gitblit v1.8.0