From 41e0fac134b5b79a4f63076dffd52dd152752c08 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 27 Feb 2024 18:15:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20OA=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=BE=85=E5=8A=9E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 1676303e..d1e1493b 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -127,10 +127,12 @@ router.beforeEach(async (to, from, next) => {
       if (to.path === '/user/login' && isOAuth2AppEnv()) {
         next({ path: OAUTH2_LOGIN_PAGE_PATH })
       } else {
-        let path = to.path
+        const path = to.fullPath
         // 在免登录白名单，直接进入
         if (to.path === '/user/login' && to.path !== process.env.VUE_APP_LOGIN_PAGE) {
-          window.location.replace(process.env.VUE_APP_LOGIN_PAGE)
+          const toPage = process.env.VUE_APP_LOGIN_PAGE.replace('/dashboard/analysis', path.replaceAll('&', '%26'))
+          console.log(toPage)
+          // window.location.replace(toPage)
           return
         }
         next()
@@ -139,8 +141,10 @@ router.beforeEach(async (to, from, next) => {
     } else {
       // 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面
       const path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login'
-      if (path === '/user/login' && path !== process.env.VUE_APP_LOGIN_PAGE) {
-        window.location.replace(process.env.VUE_APP_LOGIN_PAGE)
+      if (path === '/user/login' && to.path !== process.env.VUE_APP_LOGIN_PAGE) {
+        const toPage = process.env.VUE_APP_LOGIN_PAGE.replace('/dashboard/analysis', to.fullPath.replaceAll('&', '%26'))
+        console.log(toPage)
+        // window.location.replace(toPage)
         return
       }
       next({ path: path, query: { redirect: to.fullPath } })