From ae2d855c89ca722ac7309fdf1aa6ceed370e3b95 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期一, 11 十月 2021 20:22:30 +0800
Subject: [PATCH] 监控ui

---
 src/pages/settings/views/generalSettings.vue |   31 +++++--------------------------
 1 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 026e3c5..b2cd669 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -573,6 +573,9 @@
   flex: 1;
   flex-basis: auto;
   box-sizing: border-box;
+  .el-input__inner {
+ height: 24px !important;
+}
   .general-center {
     height: 100%;
     width: 300px;
@@ -665,28 +668,7 @@
       }
       .bar-group {
         overflow: auto;
-<<<<<<< HEAD
-        height: 400px;
-      }
-      .bar {
-        height: 48px;
-        background-color: #f8f8f8;
-        border-radius: 10px;
-        line-height: 48px;
-        box-sizing: border-box;
-        padding: 0 20px 0 20px;
-        font-weight: 700;
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 2px;
-        border: 2px solid #fff;
-        .name {
-          font-size: 14px;
-        }
-        .btns {
-          width: 52px;
-=======
-        height: 520px;
+        height: calc(100% - 132px);
         .general-bar {
           height: 48px;
           background-color: #f8f8f8;
@@ -695,7 +677,6 @@
           box-sizing: border-box;
           padding: 0 20px 0 20px;
           font-weight: 700;
->>>>>>> 0892efe5131551631fe287cfda29e59e4f2f6707
           display: flex;
           justify-content: space-between;
           margin-bottom: 2px;
@@ -1167,9 +1148,7 @@
  color: #4E94FF;
 }
 
-.el-input__inner {
- height: 24px !important;
-}
+
 
 
 /* .el-tooltip__popper {

--
Gitblit v1.8.0