From 409e480f8389e1eb9dc22e612de880783bd7159a Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 14:05:41 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 6c039cd..c9c584c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -32,14 +32,14 @@
</div>
<div v-else-if="value === 'feishui'">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteWaterdata.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteWaterdata.porltName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteWaterdata.MonTypeName }}</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="space-around">
- <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-col :span="8">鎺掓斁鍘诲悜:{{ setWasteWaterdata.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteWaterdata.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteWaterdata.OrOutPortName }}</el-col>
</el-row>
</div>
</div>
@@ -50,10 +50,40 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value', 'setWasteGasdata'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- tabData: []
+ tabData: [],
+ listLabel: [
+ {
+ label: '搴忓彿',
+ prop: 'StoragePlaceId'
+ },
+ {
+ label: '绫诲埆',
+ prop: 'StoragePlaceTypeName'
+ },
+ {
+ label: '鍥哄簾鍚嶇О',
+ prop: 'StoragePlaceName'
+ },
+ {
+ label: '浠ｇ爜',
+ prop: 'StorageZDMJ'
+ },
+ {
+ label: '浜х敓閲�(t)',
+ prop: 'StorageZCL'
+ },
+ {
+ label: '璐瓨閲�(t)',
+ prop: 'StorageZCNL'
+ },
+ {
+ label: '浜х敓瑁呯疆',
+ prop: 'StorageType'
+ }
+ ]
}
},
mounted () {
--
Gitblit v1.8.0