From 60be7c4fe2cf36d8a5902cf6a4a0b391bbed8059 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Mon, 20 May 2024 11:14:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96token=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E5=90=8E=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.ts                              |  6 +++++-
 src/enum/pageEnum.ts                            | 17 +++++++++++++++--
 .../employeeHealth/employeeHealth.vue           |  4 +++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/api/request.ts b/src/api/request.ts
index c8dd449..d01ce4e 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -6,7 +6,7 @@ import { TOKEN_KEY } from '/@/enum/cacheEnum.ts';
 import { useMessage } from '/@/hooks/web/useMessage.ts';
 import { checkStatus } from '/@/api/checkStatus.ts';
 import router from '/@/router';
-import { getBaseLogin } from '/@/enum/pageEnum.ts';
+import { getBaseLogin, toLoginByNowPath } from '/@/enum/pageEnum.ts';
 
 const { createMessage, createErrorModal } = useMessage();
 const { VITE_GLOB_API_URL } = getAppEnvConfig();
@@ -34,6 +34,10 @@ service.interceptors.response.use(
             switch (error.response.data.code) {
                 case 401:
                     let path = getBaseLogin();
+                    if (!path) {
+                        path = toLoginByNowPath(router.currentRoute.value.path);
+                    }
+                    createMessage.warn(error.response.data.message);
                     router.replace({
                         path: path,
                     });
diff --git a/src/enum/pageEnum.ts b/src/enum/pageEnum.ts
index 1bb8e83..8ca97ef 100644
--- a/src/enum/pageEnum.ts
+++ b/src/enum/pageEnum.ts
@@ -7,9 +7,22 @@ export enum PageEnum {
 }
 
 export function setBaseLogin(baseLogin) {
-    sessionStorage.setItem('baseLogin', baseLogin);
+    localStorage.setItem('baseLogin', baseLogin);
 }
 
 export function getBaseLogin() {
-    return sessionStorage.getItem('baseLogin');
+    return localStorage.getItem('baseLogin');
+}
+
+//根据当前路径跳转登录页
+export function toLoginByNowPath(nowPath: string) {
+    //西安的页面路径
+    const xianPath = ['/home', '/secondScreen'];
+    //银川的页面路径
+    const yinchuanPath = ['/yinChuanHome'];
+    if (xianPath.includes(nowPath)) {
+        return PageEnum.BASE_LOGIN;
+    } else if (yinchuanPath.includes(nowPath)) {
+        return PageEnum.BASE_LOGIN_YINCHUAN;
+    }
 }
diff --git a/src/views/yinChuan/componetns/employeeHealth/employeeHealth.vue b/src/views/yinChuan/componetns/employeeHealth/employeeHealth.vue
index d481841..e7b7abd 100644
--- a/src/views/yinChuan/componetns/employeeHealth/employeeHealth.vue
+++ b/src/views/yinChuan/componetns/employeeHealth/employeeHealth.vue
@@ -60,7 +60,9 @@
     function setList(data = {}) {
         list.value.forEach((item) => {
             const { key } = item;
-            item.value = data[key];
+            if (data && data.hasOwnProperty(key)) {
+                item.value = data[key];
+            }
         });
     }