new

src/styles/element-ui.scss

@@ -28,6 +28,7 @@
   }
 }
  .el-table th{
+<<<<<<< HEAD
    background-color: #7eaced;
    color: white;/*修改表格头部背景*/
    line-height: 3em!important;
@@ -50,20 +51,40 @@
  }
  .el-table td, .is-leaf{
    background-color: rgb(255, 255, 255);
+=======
+   background-color: rgb(98, 157, 209);
+   color: white;
+ }
+ .el-tree-node__content>.el-tree-node__expand-icon{
+   display: none;
+ }
+ .el-table td, .is-leaf{
+   background-color: rgb(213, 230, 347);
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    color: black;
    font-weight:400
  }
  .el-table--striped .el-table__body tr.el-table__row--striped td{
+<<<<<<< HEAD
    background-color: #d8dde6;/*修改斑马线表格背景*/
+=======
+   background-color: rgb(255, 255, 255);
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  }
  .el-table thead.is-group th{
    background-color: rgb(98, 157, 209);
  }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  .el-textarea__inner,
  .el-radio__inner,
  .el-input__inner{
    border: 1px solid rgb(49, 56, 72)!important;
  }
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/styles/index.scss

@@ -24,7 +24,11 @@ html {
 #app{
   height: 100%;
   .sidebar-container{
+<<<<<<< HEAD
     background-color: #152c7c;
+=======
+    background-color: #2e296a;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 }
 
@@ -99,13 +103,18 @@ el-form-item__content{
 .el-menu-item, .el-submenu__title{
   line-height: 42px;
   height: 42px;
+<<<<<<< HEAD
   //background-color: #2e296a!important;
+=======
+  background-color: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 .el-scrollbar{
   height: 100%;
 }
 
 .el-submenu__title{
+<<<<<<< HEAD
   //background-color: #2e296a!important;
 }
 .el-card__body{
@@ -166,4 +175,7 @@ el-card{
     background: #ff9759;
     border-color: #ff9759;
   }
+=======
+  background-color: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }

src/styles/sidebar.scss

@@ -45,7 +45,11 @@
     .el-menu {
       border: none;
       height: 100%;
+<<<<<<< HEAD
       background: #152c7c!important;
+=======
+      background: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       width: 100% !important;
     }
   }

src/styles/variables.scss

@@ -1,4 +1,10 @@
 //sidebar
+<<<<<<< HEAD
 $menuBg:#152c7c;
 $subMenuBg:rgb(29,53,149);
 $menuHover:rgb(40,114,199);
+=======
+$menuBg:#304156;
+$subMenuBg:#3d3780;
+$menuHover:#9892E4;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d