|
|
@@ -334,15 +334,16 @@ const fetchWarningData = async () => {
|
|
334
|
334
|
params.startDate = range.startDate
|
|
335
|
335
|
params.endDate = range.endDate
|
|
336
|
336
|
}
|
|
337
|
|
-
|
|
338
|
|
- const selectedInfo = getSelectedInfo(selectedOrg.value)
|
|
339
|
|
- if (selectedInfo) {
|
|
340
|
|
- const rawId = Number(selectedInfo.value.split('_')[1])
|
|
341
|
|
-
|
|
342
|
|
- if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
|
|
343
|
|
- else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
|
|
344
|
|
- else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
|
|
345
|
|
- else if (selectedInfo.deptType === 'user') params.userId = rawId
|
|
|
337
|
+ // cascadeOptions 未加载完成时跳过组织筛选,onMounted 加载完后会再调一次
|
|
|
338
|
+ if (cascadeOptions.value.length > 0 && selectedOrg.value) {
|
|
|
339
|
+ const selectedInfo = getSelectedInfo(selectedOrg.value)
|
|
|
340
|
+ if (selectedInfo) {
|
|
|
341
|
+ const rawId = Number(selectedInfo.value.split('_')[1])
|
|
|
342
|
+ if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
|
|
|
343
|
+ else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
|
|
|
344
|
+ else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
|
|
|
345
|
+ else if (selectedInfo.deptType === 'user') params.userId = rawId
|
|
|
346
|
+ }
|
|
346
|
347
|
}
|
|
347
|
348
|
|
|
348
|
349
|
try {
|
|
|
@@ -360,12 +361,11 @@ onMounted(async () => {
|
|
360
|
361
|
const res = await getDeptUserTree()
|
|
361
|
362
|
if (res.data) {
|
|
362
|
363
|
cascadeOptions.value = transformCascadeData(res.data)
|
|
363
|
|
- console.log(cascadeOptions.value, "cascadeOptions")
|
|
364
|
364
|
}
|
|
365
|
365
|
} catch (error) {
|
|
366
|
366
|
console.error('获取组织架构数据失败:', error)
|
|
367
|
367
|
}
|
|
368
|
|
- // fetchWarningData()
|
|
|
368
|
+ fetchWarningData()
|
|
369
|
369
|
})
|
|
370
|
370
|
|
|
371
|
371
|
// 监听路由参数变化,回显查询条件并查询
|