部门新增修改，登录标识逻辑修改

src/router/axios.js

@@ -34,11 +34,19 @@ axios.interceptors.request.use(config => {
   NProgress.start();
   const meta = (config.meta || {});
   const isToken = meta.isToken === false;
-  config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
-  //让每个请求携带token
-  if (getToken() && !isToken) {
-    config.headers[website.tokenHeader] = 'bearer ' + getToken()
+  if(config.url.indexOf('oauth/captcha') === -1){
+    config.headers["Authorization"] = `Basic ${Base64.encode(
+      `${website.clientId}:${website.clientSecret}`
+    )}`; 
+    if (getToken() && !isToken) {
+      config.headers[website.tokenHeader] = "bearer " + getToken();
+    }
   }
+  // config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
+  // //让每个请求携带token
+  // if (getToken() && !isToken) {
+  //   config.headers[website.tokenHeader] = 'bearer ' + getToken()
+  // }
   //headers中配置text请求
   if (config.text === true) {
     config.headers["Content-Type"] = "text/plain";

src/views/system/dept.vue

@@ -161,6 +161,45 @@
               }]
             },
             {
+              label: "总监",
+              type: "select",
+              dicUrl: "/api/blade-user/page?current=1&size=10000&deptId=",
+              hide: true,
+              dicFormatter: function(res){
+                var data = res.data.records;
+                return data
+              },
+              props: {
+                label: "realName",
+                value: "id"
+              },
+              dataType: "number",
+              width: 120,
+              prop: "chiefInspectorId",
+              slot: true,
+              filterable:true,
+            },
+            {
+              label: "负责人",
+              type: "select",
+              dicUrl: "/api/blade-user/page?current=1&size=10000&deptId=",
+              hide: true,
+              filterable:true,
+              props: {
+                label: "realName",
+                value: "id"
+              },
+              dicFormatter: function(res){
+                var data = res.data.records;
+                return data
+              },
+              dataType: "number",
+              width: 120,
+              prop: "personInChargeId",
+              slot: true,
+              
+            },
+            {
               label: "排序",
               prop: "sort",
               type: "number",
@@ -181,7 +220,8 @@
                 trigger: "blur"
               }],
               hide: true
-            }
+            },
+            
           ]
         },
         data: []

vue.config.js

@@ -26,14 +26,15 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        target: 'http://localhost:8080',
+        target: 'http://36.134.91.96:10001/api',
+        // target: 'https://cfm.bytesail.cn/api',
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,
         pathRewrite: {
-          '^/api': '/'
-        }
-      }
+          '^/api': '/',
+        },
+      },
     }
   }
 };