Pārlūkot izejas kodu

路由404优化

sujunling 1 gadu atpakaļ
vecāks
revīzija
ea4c2458f7
3 mainītis faili ar 9 papildinājumiem un 10 dzēšanām
  1. 2 2
      .env.development
  2. 4 5
      src/router/guard/permissionGuard.ts
  3. 3 3
      src/store/modules/user.ts

+ 2 - 2
.env.development

@@ -11,8 +11,8 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
-# VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]

+ 4 - 5
src/router/guard/permissionGuard.ts

@@ -25,10 +25,9 @@ export async function createPermissionGuard(router: Router) {
       password: 'Tofly@028',
       username: 'ADMIN2',
       mode: 'modal', //不要默认的错误提示
-    })
-      .catch((data) => {
-        console.log("自动登录:", data);
-      });
+    }).catch((data) => {
+      console.log("自动登录:", data);
+    });
     //修改地址栏链接
     window.history.pushState('', '', location.href.split('?')[0]);
   }
@@ -135,7 +134,7 @@ export async function createPermissionGuard(router: Router) {
     const routes = await permissionStore.buildRoutesAction();
 
     routes?.forEach((route) => {
-      if (route.path.indexOf('/') > -1) {
+      if (!route.path || (route.path && route.path.indexOf('/') > -1)) {
         router.addRoute(route as unknown as RouteRecordRaw);
       }
     });

+ 3 - 3
src/store/modules/user.ts

@@ -218,15 +218,15 @@ export const useUserStore = defineStore({
       // this.setSessionTimeout(false);
       // // goLogin && router.push(PageEnum.BASE_LOGIN);
       const userInfo = await getAuthCache(USER_INFO_KEY);
-      
+
       let addRecordParam = {
         systemLog: {
           cjrq: moment().format('YYYY-MM-DD HH:mm:ss'),
           czsm: "退出操作",
           opt: "logout",
           sfcg: 1,
-          userid: userInfo.info.EMPLOYEE_MIS.EMPLOYEE_ID,
-          username: userInfo.info.EMPLOYEE.NAME
+          userid: userInfo?.info?.EMPLOYEE_MIS.EMPLOYEE_ID,
+          username: userInfo?.info?.EMPLOYEE.NAME
         }
       }
       if (goLogin) {