Merge branch 'ai' into dev

src/hooks/chart.js

@@ -17,14 +17,14 @@ export function useEcharts(domRef) {
     }
   };
 
-  const setOption = (option) => {
+  const setOption = (option, notMerge = false) => {
     if (!chartInstance.value && !initialized.value) {
       initChart();
     }
     if (!chartInstance.value) return;
-    
+
     try {
-      chartInstance.value.setOption(option);
+      chartInstance.value.setOption(option, notMerge);
       // 仅在需要时调整大小，避免重复调用
       if (domRef.value && domRef.value.offsetHeight > 0) {
         chartInstance.value.resize();

src/views/assistant/components/dataBoard.vue

@@ -104,6 +104,7 @@ const currentYear = new Date().getFullYear()
 
 // 查询表单数据
 const queryForm = ref({
+  deptId: 100,
   dateRangeQueryType: 'YEAR',
   year: currentYear,
   quarter: '',
@@ -112,6 +113,7 @@ const queryForm = ref({
 
 // 当前查询参数（只有点击查询按钮时才更新）
 const currentQueryParams = ref({
+  deptId: null,
   dateRangeQueryType: 'YEAR',
   year: currentYear,
   quarter: '',
@@ -279,10 +281,10 @@ const handleExport = async () => {
     for (let i = 0; i < sectionTitles.length; i++) {
       const sectionTitle = sectionTitles[i];
       const sectionName = sectionTitle.textContent;
-      
+
       // 检查组件是否显示（通过检查父组件的显示状态）
       const componentContainer = sectionTitle.closest('.duty-organization, .quality-control, .risk-hazard, .qa-analysis');
-      const isComponentVisible = componentContainer && 
+      const isComponentVisible = componentContainer &&
         window.getComputedStyle(componentContainer).display !== 'none' &&
         componentContainer.offsetHeight > 0 &&
         componentContainer.offsetWidth > 0;
@@ -323,7 +325,7 @@ const handleExport = async () => {
           const isPanelVisible = window.getComputedStyle(panelItem).display !== 'none' &&
             panelItem.offsetHeight > 0 &&
             panelItem.offsetWidth > 0;
-          
+
           if (isPanelVisible) {
             componentPanelItems.push(panelItem);
           }

src/views/assistant/components/dutyOrganization.vue

@@ -342,7 +342,7 @@ const fetchDutyOrganizationData = async (queryParams) => {
     if (isStationType.value) {
       //获取资质等级分布柱状图数据
       const barResponse = await getQualificationBarChart({ ...processedParams, ...calculateParams })
-     
+
       qualificationBarData.value = barResponse.data?.brigades || []
 
     } else if (isTeamsType.value) {
@@ -556,7 +556,8 @@ const attendanceBarOptions = {
   },
   legend: {
     data: ['安检一大队', '安检二大队', '安检三大队', '安检综合大队', '全站'],
-    top: 0
+    top: 0,
+    show: true,
   },
   grid: {
     left: '3%',
@@ -814,6 +815,7 @@ const updateAttendanceBarChart = () => {
     attendanceBarOptions.series[2].data = dept2Data
     attendanceBarOptions.series[3].data = dept3Data
     attendanceBarOptions.series[4].data = dept4Data
+    attendanceBarOptions.legend.show = !!isStationType.value
 
     // 重新设置图表选项
     setAttendanceOption(attendanceBarOptions)
@@ -826,6 +828,7 @@ const updateAttendanceBarChart = () => {
     attendanceBarOptions.series[1].data = []
     attendanceBarOptions.series[2].data = []
     attendanceBarOptions.series[3].data = []
+    attendanceBarOptions.legend.show = !!isStationType.value
     setAttendanceOption(attendanceBarOptions)
   }
 }

src/views/assistant/components/qaAnalysis.vue

@@ -119,7 +119,8 @@ const processQueryParams = (queryParams) => {
   // 根据部门类型添加相应的参数
   const selectedDept = props.selectedDeptObject
   const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
-  processedParams.scopeType = deptType === 'STATION' ? 'STATION' : deptType == 'BRIGADE' ? 'BRIGADE' : deptType == 'DEPARTMENT' ? 'DEPT' : deptType == 'TEAMS' ? 'TEAM' : deptType == 'USER' ? 'USER' : ''
+  
+  processedParams.scopeType = deptType === 'STATION' ? 'STATION' : deptType == 'BRIGADE' ? 'BRIGADE' : deptType == 'MANAGER' ? 'MANAGER' : deptType == 'TEAMS' ? 'TEAM' : deptType == 'USER' ? 'USER' : ''
   processedParams.scopeId = id
   delete processedParams.deptId;
   delete processedParams.teamId;
@@ -329,6 +330,7 @@ const fetchCompletionTrendData = async () => {
         width: 3
       },
     }))
+    
 
     // 更新答题完成趋势图表
     setCompletionTrendOption({
@@ -374,7 +376,7 @@ const fetchCompletionTrendData = async () => {
       xAxis: {
         type: 'category',
         boundaryGap: false,
-        data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+        data: []
       },
       yAxis: {
         type: 'value',
@@ -382,15 +384,7 @@ const fetchCompletionTrendData = async () => {
         max: 100
       },
       series: [
-        {
-          name: '完成率',
-          type: 'line',
-          smooth: true,
-          data: [85, 88, 92, 90, 87, 89, 91, 93, 95, 94, 92, 90],
-          itemStyle: {
-            color: '#5470c6'
-          }
-        }
+        
       ]
     });
   }

src/views/assistant/components/qualityControl.vue

@@ -8,7 +8,7 @@
     <!-- 四个横向均分的内容区域 -->
     <div class="four-panel-layout">
       <!-- 第一个：任务计划安排统计 -->
-      <div class="panel-item" v-show="!isTeamType && !isUserType">
+      <div class="panel-item" v-show="!isTeamType && !isUserType && !isBrigadeType">
         <div class="panel-header">
           <h3>任务计划安排统计</h3>
         </div>

src/views/assistant/components/riskHazard.vue

@@ -231,7 +231,13 @@ import {
   getConcealmentPositionStats,
   getDepartmentRanking,
   getPostCategoryStats,
-  getChannelRankingStats
+  getChannelRankingStats,
+  getPoliceData,
+  getPoliceDataStats,
+  getXrayMissCheck,
+  getXrayMissCheckStats,
+  getAbnormalSeizureData,
+  getAbnormalSeizureStats
 } from '@/api/assistant/assistant.js'
 
 // 定义props接收queryForm参数
@@ -470,6 +476,17 @@ const processQueryParams = (queryParams) => {
   }
   return processedParams
 }
+const handleAbnormalCaptureStats = (data) => {
+  const { higList, lowList } = data;
+  let first = !!higList && higList.map((item) => item.departmentName).length > 0 ? `${higList.map((item) => item.departmentName).join("、")}查获违禁品数量显著高于整体水平` : '';
+  let second = !!lowList && lowList.map((item) => item.departmentName).length > 0 ? `${lowList.map((item) => item.departmentName).join("、")}查获违禁品数量显著低于整体水平` : '';
+  return `${first}${!!second ? '，' : first && second ? '。' : ''}${second}`
+}
+const handlePoliceTransferStats = (data) => {
+  const { totalQuantity, brigadeRankList } = data;
+  const topDepartment = brigadeRankList.map(item => item.brigadeName).join('、')
+  return `移交公安的违禁品数量共${totalQuantity}件，主要集中于${topDepartment}。`
+}
 
 // 调用API获取风险隐患数据
 const fetchRiskHazardData = async (queryParams) => {
@@ -516,6 +533,42 @@ const fetchRiskHazardData = async (queryParams) => {
     console.log('查获通道TOP5:', channelRankingStatsResponse)
     channelRankingStatsData.value = channelRankingStatsResponse?.data?.channelRankings || []
 
+    // 7. 移交公安数据
+    const policeDataResponse = await getPoliceData({ ...processedParams, ...otherParams })
+    console.log('移交公安数据:', policeDataResponse)
+    policeTransferData.value = policeDataResponse?.data || []
+
+    // 8. X光机漏检数据
+    const xrayMissCheckResponse = await getXrayMissCheck({ ...processedParams, ...otherParams })
+    console.log('X光机漏检数据:', xrayMissCheckResponse)
+    xrayMissData.value = xrayMissCheckResponse?.data || []
+
+    // 9. 可能异常查获数据（只有当部门类型是STATION时才请求）
+
+    if (isStationType.value || isDepartmentType.value) {
+      const abnormalSeizureResponse = await getAbnormalSeizureData({ ...processedParams, ...otherParams })
+      console.log('可能异常查获数据:', abnormalSeizureResponse)
+      abnormalCaptureData.value = abnormalSeizureResponse?.data || []
+      // 12. 可能异常查获统计数据（描述卡片文本）
+      const abnormalSeizureStatsResponse = await getAbnormalSeizureStats({ ...processedParams, ...otherParams })
+       console.log('可能异常查获统计数据:', abnormalSeizureStatsResponse,isStationType.value)
+      // debugger
+      abnormalCaptureStats.value = handleAbnormalCaptureStats(abnormalSeizureStatsResponse?.data)
+    } else {
+      abnormalCaptureData.value = []
+      abnormalCaptureStats.value = ''
+    }
+
+    // 10. 移交公安统计数据（描述卡片文本）
+    const policeDataStatsResponse = await getPoliceDataStats({ ...processedParams, ...otherParams })
+    console.log('移交公安统计数据:', policeDataStatsResponse)
+    policeTransferStats.value = handlePoliceTransferStats(policeDataStatsResponse?.data)
+
+    // 11. X光机漏检统计数据（描述卡片文本）
+    const xrayMissCheckStatsResponse = await getXrayMissCheckStats({ ...processedParams, ...otherParams })
+    console.log('X光机漏检统计数据:', xrayMissCheckStatsResponse)
+    let userName = xrayMissCheckStatsResponse?.data?.map(item => item.xrayOperatorName).join('、') || ''
+    xrayMissStats.value = `X光机漏检事件主要集中于以下开机员：${userName}，可针对性开展判图技能强化培训。`
     // 更新图表和表格数据
     updateChartsWithData()