From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/router/axios.js |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/router/axios.js b/Source/plt-web/plt-web-ui/src/router/axios.js
index 37a5615..0eaff93 100644
--- a/Source/plt-web/plt-web-ui/src/router/axios.js
+++ b/Source/plt-web/plt-web-ui/src/router/axios.js
@@ -68,15 +68,12 @@
   //濡傛灉鏄�401鍒欒烦杞埌鐧诲綍椤甸潰
   if (status === 401) {
     store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
-    if(router.history.current.path!='/login'){
-      Message({
-        message: '浼氳瘽杩囨湡锛岃閲嶆柊鐧诲綍',
-        type: 'error'
-      });
-      return Promise.reject(new Error(message))
-    }else {
-      return Promise.reject()
-    }
+    Message.closeAll();
+    Message({
+      message: '浼氳瘽杩囨湡锛岃閲嶆柊鐧诲綍',
+      type: 'error'
+    });
+    return Promise.reject()
   }
   // 濡傛灉璇锋眰涓洪潪200鍚﹁�呴粯璁ょ粺涓�澶勭悊
   if (status !== 200) {

--
Gitblit v1.9.3