From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3aa7f07..3df30bb 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>
@@ -36,7 +36,7 @@
<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-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>
@@ -77,7 +77,7 @@
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
//width: 6rem;
- height: 0.5rem;
+ //height: 0.5rem;
}
.main {
@@ -87,25 +87,31 @@
.main-matter {
font-size: 13px;
font-weight: normal;
- //padding: 10px 6px;
+ padding: 0 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;
@@ -122,7 +128,7 @@
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
- line-height: 35px;
+ line-height: 30px;
li {
text-align: center;
--
Gitblit v1.8.0