From d3ece4cef58a075c8182cf98f107bd5dfcfc34d5 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 18:16:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 84 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 1ca26ff..b8ea76b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -8,16 +8,42 @@
<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'">
+ <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-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-row>
+ </div>
+ <div v-else-if="value === 'gufei'">
+ <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>
+ <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-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-row>
+ </div>
</div>
</div>
</div>
@@ -26,7 +52,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata'],
data () {
return {
displayContentTab2: []
@@ -36,6 +62,7 @@
this.$nextTick(() => {
this.displayContentTab.forEach(item => {
this.displayContentTab2 = item
+ console.log(item)
})
})
}
@@ -47,30 +74,25 @@
.win {
position: relative;
margin-bottom: 13px;
- background-color: rgba(33, 41, 69, 0.9);
+ background-color: rgba(33, 41, 69,0.9);
}
-
.main {
width: 100%;
height: 100%;
-
- .main-matter {
+ .main-matter{
font-size: 13px;
font-weight: normal;
padding: 10px 6px;
border: 1px solid #396d83;
-
- .row-item-one {
+ .row-item-one{
margin-bottom: 7px;
}
-
.el-row {
width: 100%;
color: #00d0f9;
display: flex;
font-size: 12px !important;
-
- .el-col {
+ .el-col{
flex: 1;
width: 100%;
background-color: #243a55;;
@@ -78,46 +100,40 @@
line-height: 28px;
margin-left: 6px;
border-radius: 4px;
-
- &:nth-child(1) {
- margin-left: 0;
+ &:nth-child(1){
+ margin-left:0;
}
}
}
}
}
-
-.border_corner {
+.border_corner{
z-index: 999;
position: absolute;
width: 10px;
height: 10px;
- background: rgba(0, 0, 0, 0);
+ background: rgba(0,0,0,0);
border: 1.5px solid #47d5ea;
}
-
-.border_corner_left_top {
+.border_corner_left_top{
top: 0;
left: 0;
border-right: none;
border-bottom: none;
}
-
-.border_corner_right_top {
+.border_corner_right_top{
top: 0;
right: 0;
border-left: none;
border-bottom: none;
}
-
-.border_corner_left_bottom {
+.border_corner_left_bottom{
bottom: 0;
left: 0;
border-right: none;
border-top: none;
}
-
-.border_corner_right_bottom {
+.border_corner_right_bottom{
bottom: 0;
right: 0;
border-left: none;
--
Gitblit v1.8.0