Merge branch 'new-demand' into dev

src/views/warningManage/redLineWarning/index.vue

@@ -334,15 +334,16 @@ const fetchWarningData = async () => {
         params.startDate = range.startDate
         params.endDate = range.endDate
     }
-
-    const selectedInfo = getSelectedInfo(selectedOrg.value)
-    if (selectedInfo) {
-        const rawId = Number(selectedInfo.value.split('_')[1])
-
-        if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
-        else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
-        else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
-        else if (selectedInfo.deptType === 'user') params.userId = rawId
+    // cascadeOptions 未加载完成时跳过组织筛选，onMounted 加载完后会再调一次
+    if (cascadeOptions.value.length > 0 && selectedOrg.value) {
+        const selectedInfo = getSelectedInfo(selectedOrg.value)
+        if (selectedInfo) {
+            const rawId = Number(selectedInfo.value.split('_')[1])
+            if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
+            else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
+            else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
+            else if (selectedInfo.deptType === 'user') params.userId = rawId
+        }
     }
 
     try {
@@ -360,12 +361,11 @@ onMounted(async () => {
         const res = await getDeptUserTree()
         if (res.data) {
             cascadeOptions.value = transformCascadeData(res.data)
-            console.log(cascadeOptions.value, "cascadeOptions")
         }
     } catch (error) {
         console.error('获取组织架构数据失败:', error)
     }
-    // fetchWarningData()
+    fetchWarningData()
 })
 
 // 监听路由参数变化，回显查询条件并查询