Merge pull request 'dev-xjf' (#66) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-front/pulls/66

src/enums/pageEnum.ts

@@ -8,6 +8,9 @@ export enum PageEnum {
   // error log page path
   ERROR_LOG_PAGE = '/error-log/list',
   MESSAGE_PAGE = '/profile/notify-message',
+
+  // model train path
+  MODEL_TRAIN = '/model/list',
 }
 
 export const PageWrapperFixedHeightKey = 'PageWrapperFixedHeight'

src/router/guard/permissionGuard.ts

@@ -63,12 +63,14 @@ export function createPermissionGuard(router: Router) {
         path: LOGIN_PATH,
         replace: true,
       }
+
       if (to.path) {
         redirectData.query = {
           ...redirectData.query,
           redirect: to.path,
         }
       }
+
       next(redirectData)
       return
     }
@@ -92,7 +94,6 @@ export function createPermissionGuard(router: Router) {
         return
       }
     }
-
     if (permissionStore.getIsDynamicAddedRoute) {
       next()
       return

src/router/routes/index.ts

@@ -15,15 +15,16 @@ Object.keys(modules).forEach((key) => {
   const mod = (modules as Recordable)[key].default || {}
   const modList = Array.isArray(mod) ? [...mod] : [mod]
   routeModuleList.push(...modList)
+
 })
 
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList]
 
-// 根路由
+// 根路由--之前跳转首页，现在先跳转模型训练页，如果后面有首页要求，再改回来
 export const RootRoute: AppRouteRecordRaw = {
   path: '/',
   name: 'Root',
-  redirect: PageEnum.BASE_HOME,
+  redirect: PageEnum.MODEL_TRAIN,
   meta: {
     title: 'Root',
   },

src/store/modules/permission.ts

@@ -226,11 +226,14 @@ export const usePermissionStore = defineStore('app-permission', {
           // 动态引入组件
           routeList = transformObjToRoute(routeList)
           //  Background routing to menu structure
-          //  后台路由到菜单结构
-           const backMenuList = transformRouteToMenu([dashboard, ...routeList])
 
+//  后台路由到菜单结构
           //  为了去掉页面--关于--
           // const backMenuList = transformRouteToMenu([dashboard, ...routeList, about])
+          //  后台路由到菜单结构
+          // const backMenuList = transformRouteToMenu([dashboard, ...routeList])
+         //去掉首页
+          const backMenuList = transformRouteToMenu([...routeList])
 
           this.setBackMenuList(backMenuList)
           // remove meta.ignoreRoute item
@@ -239,10 +242,13 @@ export const usePermissionStore = defineStore('app-permission', {
           routeList = routeList.filter(routeRemoveIgnoreFilter)
           routeList = flatMultiLevelRoutes(routeList)
 
-         
-          routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList]
           //  为了去掉页面--关于--
           // routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList, about]
+          // 为了去掉页面
+          // routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList]
+
+           routes = [PAGE_NOT_FOUND_ROUTE, ...routeList]
+
           break
       }
 

src/store/modules/user.ts

@@ -153,7 +153,20 @@ export const useUserStore = defineStore('app-user', {
           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw)
           permissionStore.setDynamicAddedRoute(true)
         }
-        goHome && (await router.replace(PageEnum.BASE_HOME))
+
+
+        //原来的版本--就只跳转首页
+        //  goHome && (await router.replace(PageEnum.BASE_HOME))
+
+        // 获取重定向地址（从路由查询参数中）
+        const currentRoute = router.currentRoute.value
+        const redirectPath = currentRoute.query.redirect as string
+        const redirect = redirectPath ? decodeURIComponent(redirectPath) : null
+        // 如果有重定向地址，优先跳转到重定向地址
+        // 如果没有重定向地址，默认跳转到模型训练页
+        goHome && (await router.replace(redirect || PageEnum.MODEL_TRAIN))
+
+
       }
       return userInfo
     },