Merge branch 'gn_login' into debug

src/api/http.js

@@ -24,8 +24,8 @@ axios.interceptors.request.use(
     if (auth) {
       config.headers.Authorization = auth;
     }
-    if(storage.getCookie('ai_token')) {
-      config.headers.CookieVal = storage.getCookie('ai_token')
+    if(storage.getCookie('ai_user')) {
+      config.headers.CookieVal = storage.getCookie('ai_user')
     }
     const uuid = localStorage.getItem("uuid") || "";
     config.headers.Uuid = uuid;

src/api/modules/oldApi.js

@@ -346,7 +346,7 @@ const report2PdfImg=params=>{
 	return http.post('/smart_report/get_pdf_url',params)
 }
 
-/* 据cookie ai_token静默登录 */
+/* 据cookie ai_user静默登录 */
 export const loginTransferByCookie = params => {
 	return http.post('/user_login/username_login',params)
 }

src/main.js

@@ -203,7 +203,7 @@ router.beforeEach(async(to, from, next) => {
   } */
 
   let auth = localStorage.getItem("auth") || false;
-  if(!auth && storage.getCookie('ai_token')) {
+  if(!auth && storage.getCookie('ai_user')) {
     transferLoginByCookie();
     return
   }

src/utils/loginTransfer.js

@@ -5,7 +5,7 @@ import {router} from '../main'
 
 // 有cookie换token免登录
 export async function transferLoginByCookie() {
-  const res = await loginTransferByCookie({AdminName: storage.getCookie('ai_token')})
+  const res = await loginTransferByCookie({AdminName: storage.getCookie('ai_user')})
   if(res.Ret !== 200) return
   setLoginCookieInfo(res.Data)
 }
@@ -21,7 +21,7 @@ export function setLoginCookieInfo(data) {
   localStorage.setItem("AdminId", AdminId);
   localStorage.setItem("AdminName", AdminName);
   localStorage.setItem("loginTime",new Date())
-  storage.setCookie('ai_token',AdminName)
+  storage.setCookie('ai_user',AdminName)
 
   if(['/login','/fogetpassword'].includes(location.pathname)) {
     router.replace({path:'/home'})

src/views/Home.vue

@@ -952,7 +952,7 @@ export default {
           localStorage.setItem("ManageType", "");
           localStorage.setItem("RoleIdentity", "");
           localStorage.setItem("loginTime", "");
-          storage.setCookie('ai_token','',-1)
+          storage.setCookie('ai_user','',-1)
         }, 10);
 
       }).catch(() => { });

src/views/Login.vue

@@ -507,7 +507,7 @@ export default {
             localStorage.setItem("AdminId", res.Data.AdminId);
             localStorage.setItem("AdminName", res.Data.AdminName);
             localStorage.setItem("loginTime",new Date())
-            storage.setCookie('ai_token',res.Data.AdminName)
+            storage.setCookie('ai_user',res.Data.AdminName)
 
         },
         //根据角色判断应该进入系统的哪个页面，进入系统