diff --git a/src/router/index.ts b/src/router/index.ts index 98d8d877..1ecbc43e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -28,7 +28,7 @@ router.beforeEach((to, from, next) => { const userInfo = useUserInfo() const system = useSystem() const menu = useMenuStore() - if (!menu.siderMenus.length && !filterPath.includes(to.path)) { + if (!Object.keys(menu.menus).length && !filterPath.includes(to.path)) { userInfo.getUserInfo().then(() => { system.getSystemVersion().then((menuData: any[]) => { menuData.forEach(r => { diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts index 2f749d08..e6daa6a0 100644 --- a/src/views/init-home/data/baseMenu.ts +++ b/src/views/init-home/data/baseMenu.ts @@ -46,7 +46,7 @@ export const MESSAGE_SUBSCRIBE_MENU_DATA = { permissions: [ { permission: 'alarm-config', - action: ['query'] + actions: ['query'] } ] } diff --git a/vite.config.ts b/vite.config.ts index 19fcc265..42794316 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -90,9 +90,9 @@ export default defineConfig(({ mode}) => { proxy: { [env.VITE_APP_BASE_API]: { - target: 'http://192.168.32.226:8844', + // target: 'http://192.168.32.226:8844', // target: 'http://192.168.32.244:8881', - // target: 'http://120.77.179.54:8844', // 120测试 + target: 'http://120.77.179.54:8844', // 120测试 // target: 'http://192.168.33.46:8844', // 本地开发环境 ws: 'ws://192.168.33.46:8844', changeOrigin: true,