From 12ac24e91636c9723b2e89fc354735aa27e10c69 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 16:00:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 43 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 1ca26ff..713354f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -8,16 +8,36 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-matter">
- <el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
- </el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
- </el-row>
+ <div v-if="value === 'feiqi'">
+ <ul>
+ <li>鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</li>
+ <li>鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</li>
+ <li>鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</li>
+ <li>鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</li>
+ <li>鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</li>
+ <li>鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</li>
+ </ul>
+ </div>
+ <div v-else-if="value === 'gufei'">
+ <ul>
+ <li>鍦烘墍鍚嶇О:{{ tabData.StoragePlaceName }}</li>
+ <li>璐瓨鑳藉姏:{{ tabData.StorageQty }}(鍚�)</li>
+ <li>鍓╀綑璐瓨鑳藉姏:{{ tabData.SurplusFloorArea }}(鍚�)</li>
+ <li>鍗犲湴闈㈢Н(銕�):{{ tabData.DesignFloorArea }}(銕�)</li>
+ <li>鏈�杩戣串瀛樻棩鏈�:{{ tabData.StorageDate }}</li>
+ <li></li>
+ </ul>
+ </div>
+ <div v-else-if="value === 'feishui'">
+ <ul>
+ <li>鐩戞祴鐐瑰悕绉�:{{ setWasteWaterdata.Name }}</li>
+ <li>鐢熶骇鍗曚綅:{{ setWasteWaterdata.porltName }}</li>
+ <li>鎺掓斁绫诲瀷鍚嶇О:{{ setWasteWaterdata.MonTypeName }}</li>
+ <li>鎺掓斁鍘诲悜:{{ setWasteWaterdata.EmissDirecti }}</li>
+ <li>鎺у埗绾у埆鍚嶇О:{{ setWasteWaterdata.ContrLevelShowName }}</li>
+ <li>鍐�/澶栨帓鍙�:{{ setWasteWaterdata.OrOutPortName }}</li>
+ </ul>
+ </div>
</div>
</div>
</div>
@@ -26,18 +46,22 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- displayContentTab2: []
+ tabData: []
}
},
mounted () {
- this.$nextTick(() => {
- this.displayContentTab.forEach(item => {
- this.displayContentTab2 = item
- })
- })
+ this.processingData()
+ },
+ methods: {
+ processingData () {
+ for (var i = 0; i < this.displayContentTab.length; i++) {
+ // console.log(this.displayContentTab[i])
+ this.tabData = this.displayContentTab[i]
+ }
+ }
}
}
</script>
@@ -46,42 +70,41 @@
.win {
position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69, 0.9);
+ margin-bottom: 10px;
+ background-color: @background-color;
+ //width: 6rem;
+ //height: 0.5rem;
}
.main {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
.main-matter {
font-size: 13px;
font-weight: normal;
- padding: 10px 6px;
+ padding: 6px;
border: 1px solid #396d83;
-
- .row-item-one {
- margin-bottom: 7px;
- }
-
- .el-row {
- width: 100%;
- color: #00d0f9;
+ ul {
+ //width: 100%;
+ //height: 100%;
display: flex;
- font-size: 12px !important;
-
- .el-col {
- flex: 1;
- width: 100%;
- background-color: #243a55;;
+ align-items: center;
+ justify-content: space-around;
+ flex-wrap: wrap;
+ margin-bottom: -6px;
+ li {
+ margin-bottom: 6px;
text-align: center;
- line-height: 28px;
- margin-left: 6px;
- border-radius: 4px;
+ min-width: 32%;
+ background-color: #243a55;
+ color: #00d0f9;
+ border-radius: 3px;
+ font-size: 0.08rem;
+ }
- &:nth-child(1) {
- margin-left: 0;
- }
+ li:last-child {
+ visibility: hidden
}
}
}
@@ -93,7 +116,7 @@
width: 10px;
height: 10px;
background: rgba(0, 0, 0, 0);
- border: 1.5px solid #47d5ea;
+ border: 1px solid #47d5ea;
}
.border_corner_left_top {
--
Gitblit v1.8.0