Parcourir la source

Merge branch 'master' of http://192.168.0.130:13000/Huangxingxing/adi_cae_web

liuqiao il y a 2 ans
Parent
commit
831b2f6c09

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/index.html


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.8f823378.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.8cc1ecc8.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.b82f9639.js


+ 1 - 1
src/App.vue

@@ -13,7 +13,7 @@ export default {
       link.type = 'text/css';
       link.id = "theme";  
       link.rel = 'stylesheet';
-      link.href = './static/black.css';
+      link.href = './static/css/theme-default.css';
       document.getElementsByTagName("head")[0].appendChild(link);
     },
 }

+ 3 - 2
src/layout/index.vue

@@ -147,6 +147,7 @@ import logo from '@/assets/hcfd_images/adilog.png'
 import Login from '@/components/Login'
 import Register from '@/components/Register'
 import Forget from '@/components/Forget'
+import '@/styles/black.css'
 export default {
   name: 'Layout',
   components: {
@@ -195,9 +196,9 @@ export default {
   mounted(){
  setTimeout(function(){
  if(localStorage.getItem("switchnum")==0){
-        document.getElementById('theme').href="/static/white.css"
+        document.getElementById('theme').href="./styles/white.css"
       }else{
-        document.getElementById('theme').href="/static/black.css"
+        document.getElementById('theme').href="./styles/black.css"
       }
  },100)
 },

+ 111 - 0
src/styles/black.css

@@ -0,0 +1,111 @@
+.lbg_color1 {
+background-color: #757070;    
+
+}
+
+.lbg_color2{
+    background-color: #333;  
+}
+.lbg_color3{
+    background-color: #535353;  
+}
+.font_color1{
+  color: #fff;  
+}
+.el-menu-item a{
+    color: #fff;  
+}
+/* input */
+.scal .textselsect .el-input__inner{
+    background-color:#757070;
+     border-radius: 0;
+     border: none;
+     color: #d5d5d5;
+     height: 25px;
+     line-height: 25px;
+     
+   }
+  .el-input__icon{
+     line-height:25px;
+   }
+/* 表格 */
+.el-table td, .el-table th.is-leaf{
+    color: #d5d5d5;
+   background-color:#333;
+   
+  }
+ .el-table td, .el-table th.is-leaf{
+ border-bottom: 1px solid #666;
+ }
+ .el-table--enable-row-hover .el-table__body tr:hover>td{
+ background-color: #666 !important;
+ }
+ .scher .el-input__inner{
+  background-color:#333;
+  color: #d5d5d5;
+ }
+ .btn_color1{
+   background-color: #757070;
+   color: #b6b6b6;
+   border: 1px solid #757070;
+ }
+ .el-button:focus, .el-button:hover{
+  color: #ffffff;
+  border-color: #535353;
+  background-color: #535353;
+ }
+ .part-panel-collapse-handle{
+  border-color: transparent transparent #6f6f6f;
+ }
+ .el-tabs--card>.el-tabs__header .el-tabs__nav{
+  border:none
+  }
+  .el-tabs--card>.el-tabs__header .el-tabs__item{
+    border-left:1px solid #666
+  }
+  .el-tabs--card>.el-tabs__header{
+    border-top:1px solid #666;
+    border-bottom: 1px solid #666;
+  }
+  .scal .item1:hover{
+    transform: scale(1.3);
+    background-color: rgba(255, 255, 255, 0.3);
+    
+    }
+    /* dialog其他没有设置颜色 */
+    .dialog_color{
+      background-color: #535353;
+    }
+    .dialog_color .el-input__inner{
+      
+      color: #fff;
+      background-color: #6d6d6d;
+      border: none;
+    }
+    .dialog_color .el-form-item__label{
+      color: #d5d5d5;
+    }
+    .dialog_color .el-radio__label,.el-checkbox__label{
+      color: #d5d5d5;
+    }
+    .dialog_color .el-button {
+      color: #d5d5d5;
+      background-color: #6d6d6d;
+    }
+    .activeOrange{
+      background-color:rgba(255, 255, 255, 0.3);
+      border:2px solid #fff;
+      border-radius: 5px;
+      box-sizing: border-box;
+    }
+    .text_color,.liitem .formLabelWidth8,.formLabelWidth15{
+      color: #d5d5d5;
+    }
+    .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
+      color: #fff;
+    }
+    .el-textarea__inner{
+      background-color:#6d6d6d;
+      border: none;
+      color: #d5d5d5;
+    }

+ 74 - 0
src/styles/white.css

@@ -0,0 +1,74 @@
+.lbg_color1 {
+    background-color: #ffffff;    
+    
+    }
+    .lbg_color2{
+        background-color: #fdfdfd;  
+    }
+    .lbg_color3{
+        background-color: #eeeeee;  
+    }
+   
+    /* input 框*/
+    /* input */
+.scal .textselsect .el-input__inner{
+    background-color:#ffffff;
+     border-radius: 0;
+     border: none;
+     color: #d5d5d5;
+     height: 25px;
+     line-height: 25px;
+     
+   }
+  .el-input__icon{
+     line-height:25px;
+   }
+   /* /* 表格 */
+.el-table td, .el-table th.is-leaf{
+    color: #333;
+   background-color:#fdfdfd;
+   
+  }
+ .el-table td, .el-table th.is-leaf{
+ border-bottom: 1px solid #eee;
+ }
+ /* .el-table--enable-row-hover .el-table__body tr:hover>td{
+ background-color: #666 !important;
+ }  */
+ .scher .el-input__inner{
+    background-color:#fdfdfd;
+   }
+   .part-panel-collapse-handle{
+    border-color: transparent transparent #e4e7ed;
+   }
+   .el-tabs--card>.el-tabs__header .el-tabs__nav{
+    border:none
+    }
+    .el-tabs--card>.el-tabs__header .el-tabs__item{
+      border-left:1px solid #dee2e6;
+    }
+    .el-tabs--card>.el-tabs__header{
+      border-top:1px solid #dee2e6;
+      border-bottom: 1px solid #dee2e6;
+    }
+    .scal .item1:hover{
+      transform: scale(1.3);
+      background-color: rgba(0, 0, 0, 0.2);
+      
+      }
+      .activeOrange{
+        background-color: rgba(0, 0, 0, 0.2);
+        border:2px solid #000;
+        border-radius: 5px;
+        box-sizing: border-box;
+      }
+      .text_color,.liitem .formLabelWidth8{
+        color: #747474;
+      }
+      .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
+        color: #000;
+      }
+      .el-input__inner {
+        color: #000; 
+         border: 1px solid #666;
+    }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff