From 2e63f4c1d44e18283f48834cf1d4bc215ffafed3 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 16:30:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 15 ++++++++-------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 5 +++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 765f18a..c28589c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -10,14 +10,14 @@
<div class="main-matter">
<div v-if="value === 'feiqi'">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.Name }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.porltName }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ displayContentTab2.MonTypeName }}</el-col>
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.DeptSname }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab.EmissDirecti }}</el-col>
- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab.ContrLevelShowName }}</el-col>
- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab.OrOutPortName }}</el-col>
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
</el-row>
</div>
<div v-else-if="value === 'gufei'">
@@ -52,7 +52,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata'],
data () {
return {
displayContentTab2: []
@@ -62,6 +62,7 @@
this.$nextTick(() => {
this.displayContentTab.forEach(item => {
this.displayContentTab2 = item
+ console.log(item)
})
})
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index a12a1f0..7ef971b 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,7 +6,7 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'"></PublicTable>
<PublicChart v-else></PublicChart>
@@ -37,6 +37,7 @@
},
data () {
return {
+ setWasteGasdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
@@ -55,8 +56,8 @@
this.value = value
},
setGasData (data, value) {
+ this.setWasteGasdata = data
this.displayContentTitle = data.Name
- this.displayContentTab = data
this.flag = true
this.value = value
},
--
Gitblit v1.8.0