From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 04 三月 2025 08:39:55 +0800
Subject: [PATCH] 修改作业等级名称

---
 src/router/index.ts |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 16008c7..5971416 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -66,36 +66,37 @@
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
-    if (to.path === '/intelligentLine') {
+    NProgress.configure({ showSpinner: false });
+    if (to.meta.title) NProgress.start();
+    const token = Session.get('token');
+    if (to.path === '/login' && !token) {
         next();
+        NProgress.done();
     } else {
-        NProgress.configure({ showSpinner: false });
-        if (to.meta.title) NProgress.start();
-        const token = Session.get('token');
-        if (to.path === '/login' && !token) {
+        if (!token) {
+            next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
+            Session.clear();
+            NProgress.done();
+        } else if (token && to.path === '/login') {
+            next('/newMenu');
+            NProgress.done();
+        } else if (token && to.path === '/newMenu') {
             next();
             NProgress.done();
-        } else {
-            if (!token) {
-                next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
-                Session.clear();
-                NProgress.done();
-            } else if (token && to.path === '/login') {
-                next('/homeMenu');
-                NProgress.done();
+        } else if (token && (to.path === '/warningScreen' || to.path === '/screenPage')) {
+            next();
+            NProgress.done();
+        }else {
+            const storesRoutesList = useRoutesList(pinia);
+            const { routesList } = storeToRefs(storesRoutesList);
+            if (routesList.value.length === 0) {
+                // 后端控制路由：路由数据初始化，防止刷新时丢失
+                await initBackEndControlRoutes();
+                // 动态添加路由：防止非首页刷新时跳转回首页的问题
+                // 确保 addRoute() 时动态添加的路由已经被完全加载上去
+                next({ ...to, replace: true });
             } else {
-                const storesRoutesList = useRoutesList(pinia);
-                const { routesList } = storeToRefs(storesRoutesList);
-                if (routesList.value.length === 0) {
-
-                    // 后端控制路由：路由数据初始化，防止刷新时丢失
-                    await initBackEndControlRoutes();
-                    // 动态添加路由：防止非首页刷新时跳转回首页的问题
-                    // 确保 addRoute() 时动态添加的路由已经被完全加载上去
-                    next({ ...to, replace: true });
-                } else {
-                    next();
-                }
+                next();
             }
         }
     }

--
Gitblit v1.9.2