From fe75531a7d0af1882f30f34c25cd26514d1e2df0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期五, 09 四月 2021 10:25:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 78 ++++++++++++++-------------------------
1 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3fcdd96..817aed1 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -14,7 +14,7 @@
<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-row type="flex" class="row-bg row-item-two" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
<el-col :span="18">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
<el-col :span="18">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
@@ -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-row type="flex" class="row-bg row-item-two" justify="space-around">
+ <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,40 +50,10 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value', 'setWasteGasdata'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- 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'
- }
- ]
+ tabData: []
}
},
mounted () {
@@ -106,35 +76,42 @@
position: relative;
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
+ //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;
- min-height: 70px;
+ padding: 0px 6px;
border: 1px solid #396d83;
.row-item-one {
+ //flex-wrap: nowrap;
+ overflow: hidden;
+ margin-top: 6px;
margin-bottom: 7px;
+ //margin-left: 10px;
}
-
+ .row-item-two{
+ margin-bottom: 6px;
+ }
.el-row {
width: 100%;
color: #00d0f9;
display: flex;
font-size: 12px !important;
+ text-align: center;
.el-col {
+ text-align: center;
flex: 1;
width: 100%;
background-color: #243a55;
- text-align: center;
- line-height: 28px;
margin-left: 6px;
border-radius: 4px;
@@ -145,8 +122,8 @@
}
ul {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
@@ -161,6 +138,7 @@
background-color: #243a55;
color: #00d0f9;
border-radius: 4px;
+ font-size: 0.08rem;
}
li:last-child {
@@ -174,7 +152,7 @@
z-index: 999;
position: absolute;
width: 10px;
- //height: 10px;
+ height: 10px;
background: rgba(0, 0, 0, 0);
border: 1px solid #47d5ea;
}
--
Gitblit v1.8.0