From 9f77315b5327bb5f32eacb31a69c9601a30e3800 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 17:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index d309124..ebf7ddd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -7,16 +7,18 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>
- <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col>
- <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col>
- </el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col>
- <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
- <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
- </el-row>
+ <div class="main-matter">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>
+ <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col>
+ <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col>
+ <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
+ <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
+ </el-row>
+ </div>
</div>
</div>
</template>
@@ -35,20 +37,46 @@
.win {
position: relative;
- display: inline-block;
- //border: 1px solid #396d83;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69,0.9);
}
.main {
width: 100%;
height: 100%;
+ .main-matter{
+ font-size: 13px;
+ font-weight: normal;
+ border: 1px solid #396d83;
+ .row-item-one{
+ margin-bottom: 7px;
+ }
+ .el-row {
+ width: 100%;
+ color: #00d0f9;
+ display: flex;
+ font-size: 12px !important;
+ .el-col{
+ flex: 1;
+ width: 100%;
+ background-color: #243a55;;
+ text-align: center;
+ line-height: 28px;
+ margin-left: 6px;
+ border-radius: 4px;
+ &:nth-child(1){
+ margin-left:0;
+ }
+ }
+ }
+ }
}
.border_corner{
- z-index: 2500;
+ z-index: 999;
position: absolute;
- width: 14px;
- height: 14px;
+ width: 10px;
+ height: 10px;
background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
+ border: 1.5px solid #47d5ea;
}
.border_corner_left_top{
top: 0;
@@ -67,22 +95,11 @@
left: 0;
border-right: none;
border-top: none;
- border-bottom-left-radius: 4px;
}
.border_corner_right_bottom{
bottom: 0;
right: 0;
border-left: none;
border-top: none;
-}
-.el-row {
- color: #00d0f9;
- .el-col{
- width: 200px;
- height: 28px;
- background-color: #243a55;;
- text-align: center;
- line-height: 28px;
- }
}
</style>
--
Gitblit v1.8.0