From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/App.vue |   70 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d11fc9d..32de82a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -49,33 +49,42 @@
 };
 </script>
 <style lang="scss">
+body {
+  --operation-color: #409eff;
+}
 .el-select-dropdown__item {
   height: 100% !important;
 }
 
 .el-select-dropdown,
 .popper-class {
-  background-color: #17324c !important;
+  // background-color: #17324c !important;
 }
 
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
-  background-color: #17324c !important;
+  // background-color: #17324c !important;
 }
 
 .el-tree {
-  background-color: #09152f !important;
+  // background-color: #09152f !important;
 }
 
 .el-tree-node__content:hover,
 .el-upload-list__item:hover {
-  background-color: #09152f !important;
+  // background-color: #09152f !important;
   color: #4b9bb7 !important;
 }
 
 .el-tree-node:focus > .el-tree-node__content {
-  background-color: #070f22 !important;
+  // background-color: #070f22 !important;
   color: #4b9bb7;
+}
+
+.button-addition {
+  background-color: #eb5d01;
+  border: 1px solid #eb5d01;
+  color: #ffffff;
 }
 
 /*瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
@@ -83,7 +92,7 @@
 ::-webkit-scrollbar {
   width: 4px;
   height: 4px;
-  background-color: #070f22;
+  // background-color: #070f22;
 }
 
 /*瀹氫箟婊氬姩鏉¤建閬�
@@ -91,7 +100,7 @@
 ::-webkit-scrollbar-track {
   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
   border-radius: 10px;
-  background-color: #070f22;
+  // background-color: #070f22;
 }
 
 /*瀹氫箟婊戝潡
@@ -105,9 +114,8 @@
 // 璁剧疆dialog鏍峰紡
 .el-dialog__header,
 .el-dialog__body {
-  background-color: #06122c;
+  // background-color: #06122c;
 }
-
 .el-dialog__header {
   display: flex;
   align-items: center;
@@ -115,7 +123,6 @@
   padding: 20px;
   line-height: 60px;
 }
-
 .el-dialog__close {
   width: 20px;
   height: 20px;
@@ -127,39 +134,50 @@
 }
 
 #app {
+  .userList{
+    height: 100%;
+    overflow: auto;
+  }
+  .list{
+    height: 100%;
+    overflow: auto;
+    header{
+      background-color: transparent;
+      border: none
+    }
+  }
   // 璁剧疆寮瑰嚭妗嗘牱寮�
   .el-dialog__title {
-    color: #4b9bb7;
+    color: #333;
   }
-
+  .el-dialog__header {
+    color: black;
+    background-color: #DCDFE6;
+    //border: 1px solid #DCDFE6;
+  }
   // 璁剧疆table鏍峰紡
   .el-table__empty-block {
-    background-color: #09152f;
+    // background-color: #09152f;
   }
-
   .el-table__empty-block {
     color: #4b9bb7;
   }
-
   .el-table__empty-text {
     color: #4b9bb7;
   }
-
   .el-table .warning-row {
-    background: #06122c;
+    // background: #06122c;
   }
-
   .el-table .success-row {
-    background: #071f39;
+    // background: #071f39;
   }
-
   .el-input__inner {
-    background-color: #09152f;
-    border: 1px solid #17324c;
+    // background-color: #09152f;
+    // border: 1px solid #17324c;
   }
   .el-textarea__inner {
-    background-color: #09152f;
-    border: 1px solid #17324c;
+    // background-color: #09152f;
+    // border: 1px solid #17324c;
   }
 }
 .el-table__body-wrapper::-webkit-scrollbar {
@@ -177,6 +195,6 @@
   background-color: rgb(145, 143, 143); /*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
 }
 .el-range-input {
-  background-color: #09152f;
+  // background-color: #09152f;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.8.0