修复mes调整过来页面没有数据工厂传错的问题

This commit is contained in:
2026-11-17 16:53:05 +08:00
parent 749b128a53
commit 397b838645
3 changed files with 33 additions and 8 deletions

View File

@@ -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(() => {

View File

@@ -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 })
}
}
)
}
}

View File

@@ -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,