Merge branch 'ai' into dev

src/views/assistant/components/riskHazard.vue

@@ -474,7 +474,18 @@ const processQueryParams = (queryParams) => {
     processedParams.chainRatio = true
     processedParams.yearOnYear = true
   }
-  return processedParams
+  const selectedDept = props.selectedDeptObject
+  const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
+
+
+  let otherParams = {
+    ...(deptType == 'BRIGADE' ? { brigadeId: id } : {}),
+    ...(deptType == 'MANAGER' ? { departmentId: id } : {}),
+    ...(deptType == 'TEAMS' ? { teamId: id } : {}),
+    ...(deptType == 'USER' ? { userId: id } : {})
+  }
+  delete processedParams.deptId;
+  return { ...processedParams, ...otherParams }
 }
 const handleAbnormalCaptureStats = (data) => {
   const { higList, lowList } = data;
@@ -493,65 +504,59 @@ const fetchRiskHazardData = async (queryParams) => {
   try {
     // 处理query参数
     const processedParams = processQueryParams(queryParams)
-    const selectedDept = props.selectedDeptObject
-    const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
-    let otherParams = {
-      ...(deptType == 'BRIGADE' ? { brigadeId: id } : {}),
-      ...(deptType == 'DEPARTMENT' ? { departmentId: id } : {}),
-      ...(deptType == 'TEAMS' ? { teamId: id } : {}),
-      ...(deptType == 'USER' ? { userId: id } : {})
-    }
+
+    
     // 按顺序调用六个API接口
 
     // 1. 查获违禁品类别统计
-    const categoryStatsResponse = await getCategoryStats({ ...processedParams, ...otherParams })
+    const categoryStatsResponse = await getCategoryStats(processedParams)
     console.log('查获违禁品类别统计:', categoryStatsResponse)
     categoryStatsData.value = categoryStatsResponse.data?.categoryStats || []
 
     // 2. 查获时间趋势
-    const seizureTimeTrendResponse = await getSeizureTimeTrend({ ...processedParams, ...otherParams })
+    const seizureTimeTrendResponse = await getSeizureTimeTrend(processedParams)
     console.log('查获时间趋势:', seizureTimeTrendResponse)
     seizureTimeTrendData.value = seizureTimeTrendResponse?.data || []
 
     // 3. 隐匿物品查获部位统计
-    const concealmentPositionStatsResponse = await getConcealmentPositionStats({ ...processedParams, ...otherParams })
+    const concealmentPositionStatsResponse = await getConcealmentPositionStats(processedParams)
     console.log('隐匿物品查获部位统计:', concealmentPositionStatsResponse)
     concealmentPositionStatsData.value = concealmentPositionStatsResponse?.data?.positionStats || []
 
     // 4. 大队查获排名（表格数据）
-    const departmentRankingResponse = await getDepartmentRanking({ ...processedParams, ...otherParams })
+    const departmentRankingResponse = await getDepartmentRanking(processedParams)
     console.log('大队查获排名:', departmentRankingResponse)
     departmentRankingData.value = departmentRankingResponse.data || []
 
     // 5. 查获岗位分布统计
-    const postCategoryStatsResponse = await getPostCategoryStats({ ...processedParams, ...otherParams })
+    const postCategoryStatsResponse = await getPostCategoryStats(processedParams)
     console.log('查获岗位分布统计:', postCategoryStatsResponse)
     postCategoryStatsData.value = postCategoryStatsResponse?.data?.postStats || []
 
     // 6. 查获通道TOP5（表格数据）
-    const channelRankingStatsResponse = await getChannelRankingStats({ ...processedParams, ...otherParams })
+    const channelRankingStatsResponse = await getChannelRankingStats(processedParams)
     console.log('查获通道TOP5:', channelRankingStatsResponse)
     channelRankingStatsData.value = channelRankingStatsResponse?.data?.channelRankings || []
 
     // 7. 移交公安数据
-    const policeDataResponse = await getPoliceData({ ...processedParams, ...otherParams })
+    const policeDataResponse = await getPoliceData(processedParams)
     console.log('移交公安数据:', policeDataResponse)
     policeTransferData.value = policeDataResponse?.data || []
 
     // 8. X光机漏检数据
-    const xrayMissCheckResponse = await getXrayMissCheck({ ...processedParams, ...otherParams })
+    const xrayMissCheckResponse = await getXrayMissCheck(processedParams)
     console.log('X光机漏检数据:', xrayMissCheckResponse)
     xrayMissData.value = xrayMissCheckResponse?.data || []
 
     // 9. 可能异常查获数据（只有当部门类型是STATION时才请求）
 
     if (isStationType.value || isDepartmentType.value) {
-      const abnormalSeizureResponse = await getAbnormalSeizureData({ ...processedParams, ...otherParams })
+      const abnormalSeizureResponse = await getAbnormalSeizureData(processedParams)
       console.log('可能异常查获数据:', abnormalSeizureResponse)
       abnormalCaptureData.value = abnormalSeizureResponse?.data || []
       // 12. 可能异常查获统计数据（描述卡片文本）
-      const abnormalSeizureStatsResponse = await getAbnormalSeizureStats({ ...processedParams, ...otherParams })
-       console.log('可能异常查获统计数据:', abnormalSeizureStatsResponse,isStationType.value)
+      const abnormalSeizureStatsResponse = await getAbnormalSeizureStats(processedParams)
+      console.log('可能异常查获统计数据:', abnormalSeizureStatsResponse, isStationType.value)
       // debugger
       abnormalCaptureStats.value = handleAbnormalCaptureStats(abnormalSeizureStatsResponse?.data)
     } else {
@@ -560,12 +565,12 @@ const fetchRiskHazardData = async (queryParams) => {
     }
 
     // 10. 移交公安统计数据（描述卡片文本）
-    const policeDataStatsResponse = await getPoliceDataStats({ ...processedParams, ...otherParams })
+    const policeDataStatsResponse = await getPoliceDataStats(processedParams)
     console.log('移交公安统计数据:', policeDataStatsResponse)
     policeTransferStats.value = handlePoliceTransferStats(policeDataStatsResponse?.data)
 
     // 11. X光机漏检统计数据（描述卡片文本）
-    const xrayMissCheckStatsResponse = await getXrayMissCheckStats({ ...processedParams, ...otherParams })
+    const xrayMissCheckStatsResponse = await getXrayMissCheckStats(processedParams)
     console.log('X光机漏检统计数据:', xrayMissCheckStatsResponse)
     let userName = xrayMissCheckStatsResponse?.data?.map(item => item.xrayOperatorName).join('、') || ''
     xrayMissStats.value = `X光机漏检事件主要集中于以下开机员：${userName}，可针对性开展判图技能强化培训。`