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/GasComponents/GasTab.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index e6001e3..23f565c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -12,11 +12,17 @@
<el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>
<el-col :span="8">鐢熶骇鍗曚綅:{{ displayContent.porltName }}</el-col>
<el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.MonTypeName }}</el-col>
+ <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col>
<el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
<el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
+ <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
+ <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
+ <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
</el-row>
</div>
</div>
@@ -28,18 +34,8 @@
name: 'GasTable',
props: ['displayContent'],
data () {
- return {
- // getGasDatas:[]
- }
- },
- mounted () {
- // this.$nextTick(() => {
- // this.getGasData.forEach(item => {
- // this.getGasDatas = item
- // })
- // })
+ return {}
}
-
}
</script>
--
Gitblit v1.8.0