Merge branch 'master' into dev

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-27 09:42:59
+ * @LastEditTime: 2023-03-27 13:25:25
 -->
 # 安装依赖
 npm install
@@ -19,4 +19,6 @@ npm install --registry=https://registry.npm.taobao.org
   - `docs` 文档/注释
   - `chore` 依赖更新/脚手架配置修改等
   - `wip` 开发中
-
+  
+## 项目换肤 
+给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量  
\ No newline at end of file

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-24 17:10:32
+ * @LastEditTime: 2023-03-27 14:09:57
 -->
 <template>
   <div>
@@ -48,9 +48,6 @@ export default {
     asyncRoutes () {
       return asyncRoutes
     }
-  },
-  mounted () {
-    console.log(this.permission_routes.slice(5), 'permission_routes');
   }
 }
 </script>

@@ -16,7 +16,6 @@ NProgress.configure({ showSpinner: false });
 router.beforeEach(async (to, from, next) => {
   getTheme()
   NProgress.start();
-  window.document.documentElement.setAttribute("data-theme", 'blue');
   document.title = getPageTitle(to.meta.title);
   let hasAddDict = store.state.dict.addDict;
   let hasUser = store.state.user.hasUser;
@@ -55,6 +54,7 @@ router.beforeEach(async (to, from, next) => {
         } else {
           next();
         }
+        window.document.documentElement.setAttribute("data-theme", 'blue');
       }
     } else {
       if (code == 'BDCSBPT') {

@@ -15,7 +15,13 @@ $themes: (blue: ( //背景
     tagsActiveText: #4162D8,
     // 操纵btn
     btnBg: #4162D8,
-    btnColor: #4162D8),
+    btnColor: #4162D8,
+    // table样式相关
+    pagBg:rgba(65, 98, 216, 0.1),
+    pagBorderColor: #D9D9D9,
+    pagText: #4A4A4A,
+    pagActiveText: #4162D8,
+  ),
 
   green: (navbg: #0F8B80,
     menuBg:#121A2E,

@@ -9,12 +9,6 @@
   line-height: 16px;
 }
 
-//input
-.el-input__inner {
-  color: #FFFFFF !important;
-  padding: 0 7px !important;
-}
-
 // input 样式
 // 全局css 加上以下代码，可以隐藏上下箭头
 
@@ -429,10 +423,6 @@ table td {
     background: color #074487;
   }
 
-  .el-input__inner {
-    background-color: #074487;
-  }
-
   .el-input.is-disabled .el-input__inner {
     background-color: #074487;
   }

@@ -53,6 +53,12 @@
   background-color: rgba(0, 0, 0, 0);
 }
 
+//input
+.el-input__inner {
+  color: #FFFFFF !important;
+  padding: 0 7px !important;
+}
+
 // 查询表单样式
 .from-clues {
   height: 100%;
@@ -77,7 +83,7 @@
     .el-input__inner {
       background: #07388B;
       border-radius: 2px;
-      color: #CEF8FF !important;
+      color: #7A7A7A !important;
       border: 1px solid #6BC1FC;
     }
 
@@ -1023,4 +1029,4 @@
   .selbig {
     width: 500px;
   }
-}
+}
\ No newline at end of file

+@import "~@/styles/_handle.scss";
+
 // cover some element-ui styles
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
@@ -172,6 +174,25 @@ input[type="number"] {
   color: #4A4A4A;
 }
 
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .el-pager li {
+  @include borderColor("pagBorderColor");
+  background-color: #FFFFFF;
+  @include font_color("pagText");
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  @include background("pagBg");
+  border-radius: 4px;
+  @include font_color("pagActiveText");
+  @include borderColor("pagActiveText");
+}
+
+.el-table__header th {
+  background-color: #F1F3F7 !important;
+}
+
 .el-table tr td {
   font-size: 14px;
   color: #7A7A7A;
@@ -197,4 +218,4 @@ input[type="number"] {
 
 .el-form-item__content {
   flex: 1;
-}
+}
\ No newline at end of file

 @import '~@/styles/sbElement-ui.scss';
 @import "~@/styles/_handle.scss";
 
+//input
+.el-input__inner {
+  color: #7A7A7A !important;
+  padding: 0 7px !important;
+}
+
 .from-clues {
   height: 100%;
   width: 100%;
@@ -10,7 +16,7 @@
 
   &-header {
     width: 100%;
-    padding: 10px 15px 10px 15px;
+    padding: 7px 15px 10px 15px;
     box-sizing: border-box;
     background-size: 100% 100%;
     background: #FFFFFF;

@@ -15,7 +15,7 @@
             <el-input type="password" class="password" v-model="user.password" placeholder="请输入密码"
               show-password></el-input>
           </el-form-item>
-          <!-- <el-form-item prop="yz">
+          <el-form-item prop="yz">
             <div class="flex-container">
               <div class="flex-input">
                 <el-input class="yz" @keyup.native="login('user')" v-model="user.yz" placeholder="请输入验证码"></el-input>
@@ -26,7 +26,7 @@
                 <font id="renovate" @click="verification">换一批</font>
               </div>
             </div>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item class="login-btn">
             <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button>
           </el-form-item>
@@ -244,9 +244,7 @@ export default {
 .login-inner-bg {
   background: white;
   width: 24.6%;
-  height: 47%;
   min-width: 360px;
-  min-height: 380px;
   top: 30%;
   right: 38%;
   position: absolute;

@@ -6,7 +6,6 @@ function resolve (dir) {
 }
 const name = defaultSettings.title
 const port = process.env.port || process.env.npm_config_port || 8888 // dev port
-
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
     /**