From b609f77709c4646daf155341475ae14fc0c7943d Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 27 六月 2025 13:25:30 +0800
Subject: [PATCH] 修改

---
 src/permission.js |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 3b75a13..eef296e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -11,16 +11,18 @@
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login'];
+const whiteList = ['/homePage','/fillForm','/checkProgress','/certPdf'];
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
     to.meta.title && useSettingsStore().setTitle(to.meta.title)
     /* has token*/
-    if (to.path === '/login') {
+    if (to.path === '/homePage') {
       next({ path: '/' })
       NProgress.done()
+    } else if (whiteList.indexOf(to.path) !== -1) {
+      next()
     } else {
       if (useUserStore().roles.length === 0) {
         isRelogin.show = true
@@ -34,7 +36,22 @@
                 router.addRoute(route) // 动态添加可访问路由表
               }
             })
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            console.log(to.fullPath,"to.fullPath")
+            if (to.fullPath == '/index') {
+              // 当登录之后,直接通过ip地址和端口号访问时,跳转到第一个路由页面indexPage
+              let pathIndex = ''
+              //通过权限返回菜单去避免 如有首页权限 出现//index 情况
+              if (accessRoutes[0].path == '/') {
+                pathIndex = accessRoutes[0].path + accessRoutes[0].children[0].path
+              } else{
+                pathIndex = accessRoutes[0].path + '/' + accessRoutes[0].children[0].path
+              }
+              next({ path: pathIndex, replace: true }) // hack方法 确保addRoutes已完成
+            } else {
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            }
+            // next({ ...to, replace: true })
+            // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
           useUserStore().logOut().then(() => {
@@ -52,7 +69,7 @@
       // 在免登录白名单,直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      next(`/homePage?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }

--
Gitblit v1.9.2