From 397b838645f1fb69214b9e92c010b74571a84503 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 17 Nov 2026 16:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmes=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=BF=87=E6=9D=A5=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B7=A5=E5=8E=82=E4=BC=A0=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 6 ++-- src/utils/mixins/navigationStateMixin.js | 30 +++++++++++++++---- .../operatingRevenue/operatingRevenueBase.vue | 5 ++++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/permission.js b/src/permission.js index 5d3e97a4..46f33a1e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -96,8 +96,9 @@ router.beforeEach((to, from, next) => { } // 获取字典数据 add by 芋艿 store.dispatch('dict/loadDictDatas') - // 获取部门权限 - store.dispatch('GetLevel') + // 获取部门权限:等待 GetLevel 返回后再放行路由,确保驾驶舱页面初始化时 levelList 已就绪 + //(接口失败不阻塞导航,失败场景由 navigationStateMixin 内的 levelList 监听兜底) + store.dispatch('GetLevel').catch(() => {}).then(() => { // 触发 GenerateRoutes 事件时,将 menus 菜单树传递进去 store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => { // 根据 roles 权限生成可访问的路由表 @@ -115,6 +116,7 @@ router.beforeEach((to, from, next) => { } else { next({ ...to, replace: true }) // hack方法 确保addRoutes已完成,当前页刷新时保留 to 的路径 } + }) }) }).catch(err => { store.dispatch('LogOut').then(() => { diff --git a/src/utils/mixins/navigationStateMixin.js b/src/utils/mixins/navigationStateMixin.js index cc0a3dfa..189c5d7c 100644 --- a/src/utils/mixins/navigationStateMixin.js +++ b/src/utils/mixins/navigationStateMixin.js @@ -76,13 +76,31 @@ export default { // 方式 1:使用 store 默认值 if (!restoredFactory) { - if (this.$store.getters.levelList && this.$store.getters.levelList.length > 0) { - const validBases = this.$store.getters.levelList.filter(item => item.id !== 1) - if (validBases.length > 0) { - this.factory = validBases[0].id - } else { - this.factory = this.$store.getters.levelList[0].id + const applyDefaultFactory = () => { + if (this.$store.getters.levelList && this.$store.getters.levelList.length > 0) { + const validBases = this.$store.getters.levelList.filter(item => item.id !== 1) + if (validBases.length > 0) { + this.factory = validBases[0].id + } else { + this.factory = this.$store.getters.levelList[0].id + } + return true } + return false + } + // levelList 尚未就绪(GetLevel 未返回,常见于热缓存下页面创建先于接口响应): + // 监听就绪后补赋 factory,并在 dateData 已就绪的前提下补发首屏请求 + if (!applyDefaultFactory()) { + const unwatch = this.$watch( + () => this.$store.getters.levelList, + (list) => { + unwatch() + if (this.factory != null || !Array.isArray(list) || list.length === 0) return + if (applyDefaultFactory() && onStateRestored) { + onStateRestored({ factory: this.factory, dateData: this.dateData }) + } + } + ) } } diff --git a/src/views/home/operatingRevenue/operatingRevenueBase.vue b/src/views/home/operatingRevenue/operatingRevenueBase.vue index ac5ac1d4..b1aae035 100644 --- a/src/views/home/operatingRevenue/operatingRevenueBase.vue +++ b/src/views/home/operatingRevenue/operatingRevenueBase.vue @@ -178,6 +178,11 @@ export default { this.getData() }, getData() { + // factory 未就绪时直接跳过(避免 Number(null) 被转成 0 发出错误请求), + // 后续由 navigationStateMixin 的 levelList 监听补发首屏请求 + if (this.factory == null || this.factory === '') { + return; + } const requestParams = { startTime: this.dateData.startTime, endTime: this.dateData.endTime,