Merge branch 'master' into dev

 {
   "TITLE": "汉中市数据上报系统",
   "THEME": "sb",
-  "CODE": "BDCJGPT",
+  "CODE": "BDCSBPT",
   "SERVERAPI": "/bdcsjsb",
   "calcHeight": 160,
   "echartTextColor": "#4A4A4A",

@@ -16,6 +16,10 @@ $themes: (blue: ( //背景
     // 操纵btn
     btnBg: #4162D8,
     btnColor: #4162D8,
+    // 边框
+    border: #4162D8,
+    // 选中按钮
+    btnselect:#203cb8,
     // table样式相关
     pagBg:rgba(65, 98, 216, 0.1),
     pagBorderColor: #D9D9D9,
@@ -28,4 +32,4 @@ $themes: (blue: ( //背景
     menuActive: linear-gradient(90deg, rgba(61, 90, 198, 0.7) 0%, rgba(61, 90, 198, 0) 100%),
     //字体
     menuText: #A1A7C2,
-    menuActiveText: #FFFFFF))
\ No newline at end of file
+    menuActiveText: #FFFFFF))

 @import '~@/styles/sbElement-ui.scss';
 @import "~@/styles/_handle.scss";
+@import "~@/styles/_handle.scss";
 
 //input
 .el-input__inner {
@@ -154,10 +155,14 @@
     color: #cef8ff !important;
     // background: url("~@/image/tabitem.png") no-repeat;
     // background-size: 100% 100%;
-    background-color: #3D59C4;
+    @include background("btnBg");
     border-radius: 3px;
   }
 
+  .el-tabs__item.is-active {
+    @include background("btnselect");
+  }
+
   .el-dialog__headerbtn .el-dialog__close {
     font-size: 20px;
     color: white;
@@ -180,17 +185,17 @@
 }
 
 // 面包屑
-.breadcrumb {
-  width: 80%;
-  text-indent: 10px;
-  background: url("~@/image/breadcrumb.png") no-repeat;
-  background-size: 100% 100%;
-  line-height: 32px;
-  height: 32px;
-  padding-left: 35px;
-  margin: 8px 0 10px 6px;
-  color: #CEF8FF;
-}
+// .breadcrumb {
+//   width: 80%;
+//   text-indent: 10px;
+//   background: url("~@/image/breadcrumb.png") no-repeat;
+//   background-size: 100% 100%;
+//   line-height: 32px;
+//   height: 32px;
+//   padding-left: 35px;
+//   margin: 8px 0 10px 6px;
+//   color: #CEF8FF;
+// }
 
 .el-icon-arrow-right {
   width: 2px;
@@ -247,6 +252,11 @@
 
 // 登簿日志弹出框
 .commonDialog {
+  .el-textarea.is-disabled .el-textarea__inner {
+    margin-top: 20px;
+    @include borderColor("border");
+  }
+
   /deep/.dialog-from_header {
     margin: 0 !important;
   }
@@ -259,11 +269,12 @@
   .el-dialog__header {
     text-align: center;
     font-size: 24px;
-    background-color: #3D59C4;
+    @include background("navbg");
   }
 
   .el-tabs__header {
     margin: 0 !important;
+    border-bottom: none;
   }
 
   .el-dialog {
@@ -293,7 +304,6 @@
     }
 
     .editXML {
-      border: 1px solid blue;
       margin-top: 10px;
 
       .el-textarea__inner {
@@ -329,8 +339,17 @@
     display: none;
   }
 
+  .el-tabs__item {
+    color: #cef8ff !important;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    @include background("btnBg");
+    border-radius: 3px;
+  }
+
   .el-tabs__item.is-active {
-    background-color: #3D59C4;
+    @include background("btnselect");
   }
 
   .from-clues-content {
@@ -365,8 +384,10 @@
       width: 100%;
     }
 
+
+
     .el-textarea__inner {
-      border: none !important;
+
       margin: 0;
     }
 
@@ -409,7 +430,7 @@
     display: flex;
     justify-content: center;
     font-size: 24px;
-    background-color: #3D59C4;
+    @include background("navbg");
 
     .dialog_title {
 
@@ -464,16 +485,16 @@
     display: flex;
     flex-direction: row;
     justify-content: center;
-    background-color: #3D59C4;
+    @include background("btnBg");
     border-radius: 3px;
   }
 
   .obligee-item-name {
     // background: url("~@/image/itembg.png") no-repeat;
     // background-size: 100% 100%;
-    background-color: #3D59C4;
+    @include background("btnBg");
     border-radius: 3px;
-    border: 1px solid blue !important;
+    @include borderColor("border");
   }
 
   .el-tabs__nav-scroll {
@@ -493,7 +514,8 @@
 
     &-con {
       background: #ffffff;
-      border: 1px solid blue;
+      // @include borderColor("border");
+      // border: 1px solid blue;
       border-radius: 2px;
       padding: 10px;
       box-sizing: border-box;
@@ -532,6 +554,7 @@
   .el-tabs__header {
     border: none;
     margin-bottom: 0;
+    border-bottom: none;
   }
 
   .el-tabs__item.is-top:not(:last-child) {
@@ -543,7 +566,7 @@
   }
 
   .el-tabs__item.is-active {
-    background-color: #1c3294;
+    @include background("btnselect");
     color: #FFFFFF;
   }
 
@@ -624,7 +647,7 @@
     }
 
     .el-input__suffix {
-      right: -25px !important;
+      right: 0px !important;
       top: -5px;
     }
 
@@ -670,7 +693,7 @@
     text-align: center;
     margin-bottom: 10px;
     font-size: 24px;
-    background-color: #3D59C4;
+    @include background("navbg");
 
     .dialog_title {
       b {
@@ -736,7 +759,6 @@
         padding: 0 8px;
         height: 40px;
         line-height: 40px;
-        border: 1px solid #6bc1fc;
       }
     }
   }
@@ -764,7 +786,6 @@
         padding: 0 8px;
         height: 40px;
         line-height: 40px;
-        border: 1px solid #6bc1fc;
       }
     }
 
@@ -826,9 +847,8 @@
   .obligee-item-name,
   .receivingInfo-item-name,
   .auditInfo-item-name {
-    background-color: #3D59C4;
+    @include background("btnselect");
     border-radius: 3px;
-    border: 1px solid blue !important;
     color: #FFFFFF;
   }
 
@@ -838,7 +858,6 @@
     background: none;
     color: #FFFFFF;
     border-radius: 2px;
-    border: 1px solid #6BC1FC;
   }
 
   .el-input-number {
@@ -866,7 +885,6 @@
     width: 96%;
     // background: #05275B;
     border-radius: 2px;
-    border: 1px solid #6BC1FC;
     text-align: left;
 
   }
@@ -904,7 +922,7 @@
     display: flex;
     justify-content: center;
     font-size: 24px;
-    background-color: #3D59C4;
+    @include background("navbg");
 
     .dialog_title {
 

 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
- * @LastEditTime: 2023-03-21 15:03:37
+ * @LastEditTime: 2023-03-29 10:14:34
  */
+import Vue from 'vue'
 import axios from "axios";
 import { Message } from "element-ui";
 import { endLoadingSubCount } from "./requestLoading";
@@ -68,12 +69,23 @@ function handleErrorData (status) {
         window.tokenValid = false;
         Message.error("由于长时间未操作，请重新登录!");
         localStorage.removeItem("token");
-        router.replace({
-          path: "/jg",
-          query: {
-            redirect: router.history.current.fullPath,
-          },
-        });
+        let code = Vue.prototype.BASE_API.CODE
+        if (code == 'BDCSBPT') {
+          router.replace({
+            path: "/sb",
+            query: {
+              redirect: router.history.current.fullPath,
+            },
+          });
+        } else {
+          router.replace({
+            path: "/jg",
+            query: {
+              redirect: router.history.current.fullPath,
+            },
+          });
+        }
+        
       }
       break;
     case 403: