From 1a5cd8c7fde9c7f7218742ea962d30d9a9820155 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期日, 26 九月 2021 20:16:57 +0800
Subject: [PATCH] 弹层层级bug修复v3
---
src/pages/settings/views/deviceInfo.vue | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/src/pages/settings/views/deviceInfo.vue b/src/pages/settings/views/deviceInfo.vue
index ebe0002..fec3ae0 100644
--- a/src/pages/settings/views/deviceInfo.vue
+++ b/src/pages/settings/views/deviceInfo.vue
@@ -3,43 +3,47 @@
<div class="general-set">
<div class="general-right">
<div class="lang" >
- <div class="bar">
+ <div class="general-title">
+ <span class="iconfont">{{info}}</span>
+ <span class="general-info">璁惧淇℃伅</span>
+ </div>
+ <div class=" info-bar">
<span class="name">璁惧ID</span>
<span class="desc">{{ deviceInfo.server_id }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">璁惧鍨嬪彿</span>
<span class="desc">{{ deviceInfo.deviceModel }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">璁惧绫诲瀷</span>
<span class="desc">{{ deviceInfo.deviceDesc }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">閫氶亾涓暟</span>
<span class="desc">{{ deviceInfo.channelCount }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">涓绘帶鐗堟湰</span>
<span class="desc">{{ deviceInfo.masterVersion }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">web鐗堟湰</span>
<span class="desc">{{ deviceInfo.webVersion }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">纭洏淇℃伅</span>
<span class="desc">{{ deviceInfo.disks }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">CPU</span>
<span class="desc">{{ deviceInfo.cpu }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">鍐呭瓨</span>
<span class="desc">{{ deviceInfo.memory }}</span>
</div>
- <div class="bar">
+ <div class=" info-bar">
<span class="name">杩愯鏃堕棿</span>
<span class="desc">{{ deviceInfo.runningTime }}</span>
</div>
@@ -58,6 +62,7 @@
return {
min_len: 0,
max_len: 0,
+ info:"\ue6e8",
fakeObj: {
min: 0,
max: 0,
@@ -122,7 +127,9 @@
flex: 1;
flex-basis: auto;
box-sizing: border-box;
- .general-center {
+ background-color: #F2F2F7;
+
+ /* .general-center {
height: 100%;
width: 280px;
overflow: auto;
@@ -157,15 +164,54 @@
background-color: #3d68e1;
color: white;
}
+ } */
+ .general-title {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-bottom:10px ;
+ height: 110px;
+ background-color: #fff;
+ .general-info {
+ margin-left: 10px;
+ font-size: 16px;
+ color:#333 ;
+ font-weight: 700;
+ }
+ .iconfont {
+ margin-right: 10px;
+ font-size: 40px;
+ }
}
+
+ .general-right .lang .info-bar {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom:10px ;
+ padding: 0 40px;
+ height: 45px;
+ color: #4F4F4F;
+ font-size: 16px !important;
+ font-weight: 700;
+ background-color: #fff;
+ .desc {
+ color: #4F4F4F;
+ font-size: 16px;
+ font-weight: 700;
+ }
+ &:hover {
+ background-color: #F8F8FF;
+ }
+ }
+
.general-right {
flex: 1;
flex-basis: auto;
overflow: auto;
box-sizing: border-box;
-
- padding: 20px 40px;
- .el-form-item.is-required:not(.is-no-asterisk)
+ padding: 10px 15px !important;
+ /* .el-form-item.is-required:not(.is-no-asterisk)
> .el-form-item__label:before,
.el-form-item.is-required:not(.is-no-asterisk)
.el-form-item__label-wrap
@@ -431,7 +477,7 @@
}
}
}
- }
+ } */
}
}
</style>
--
Gitblit v1.8.0