260720

src/store/modules/user.ts

@@ -5,11 +5,12 @@ import { defineStore } from 'pinia';
 import { formatMenus, toTreeData, formatTreeData } from 'ele-admin-pro/es';
 import type { MenuItemType } from 'ele-admin-pro/es';
 import type { User } from '@/api/system/user/model';
+import router from '@/router';
 import { USER_MENUS } from '@/config/setting';
 import { getUserInfo } from '@/api/layout';
 import { initialization } from '@/api/oa/tennat';
 import { message } from 'ant-design-vue';
-const EXTRA_MENUS: any = [];
+
 
 export interface UserState {
   info: User | null;
@@ -47,7 +48,7 @@ export const useUserStore = defineStore({
             const hide = message.loading('系统正在初始化...', 500);
             initialization(d.roleId).then(() => {
               hide();
-              location.replace('/');
+              router.replace('/');
               return;
             });
           }
@@ -69,7 +70,7 @@ export const useUserStore = defineStore({
             data: result.authorities?.filter((d) => d.menuType !== 1),
             idField: 'menuId',
             parentIdField: 'parentId'
-          }).concat(EXTRA_MENUS)
+          })
       );
       this.menus = menus;
       // 缓存租户信息