feat(数据看板): 新增部门树选择功能并优化数据展示

refactor(组件): 重构部门数据传递逻辑，支持多层级展示

fix(风险隐患): 修复表格滚动和显示问题，优化描述文案

feat(质控分析): 新增移交公安数据和X光机漏检数据展示

style(使用报告): 优化文案格式和内容展示顺序

perf(导出功能): 改进Word导出逻辑，支持隐藏组件和表格优化

src/api/assistant/assistant.js

@@ -108,6 +108,8 @@ export function getCalculateByTimeList(data) {
   })
 }
 
+
+
 //使用报告
 export function getUsageReport(query) {
   return request({
@@ -115,4 +117,81 @@ export function getUsageReport(query) {
     method: 'get',
     params: query
   })
+}
+// 抽问抽答完成趋势
+export function getCompletionTrend(params = {}) {
+  return request({
+    url: '/v1/cs/app/daily-exam/completion-comparison',
+    method: 'get',
+    params
+  })
+}
+
+// 错题分析 - 总体问题分布
+export function getWrongAnalysisOverview(params = {}) {
+  return request({
+    url: '/v1/cs/app/daily-exam/wrong-analysis/pc-overview',
+    method: 'get',
+    params
+  })
+}
+
+// 错题分析 - 问题分布对比（雷达图）
+export function getWrongAnalysisRadar(params = {}) {
+  return request({
+    url: '/v1/cs/app/daily-exam/wrong-analysis/pc-radar',
+    method: 'get',
+    params
+  })
+}
+
+//移交公安数据
+export function getPoliceData(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/police-data',
+    method: 'get',
+    params
+  })
+}
+//移交公安数据统计
+export function getPoliceDataStats(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/police-stats',
+    method: 'get',
+    params
+  })
+}
+
+//X 光机漏检数据
+export function getXrayMissCheck(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/xray-miss-check',
+    method: 'get',
+    params
+  })
+}
+//X 光机漏检人员统计 TOP3
+export function getXrayMissCheckStats(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/xray-miss-check-top3',
+    method: 'get',
+    params
+  })
+}
+
+//异常查获数据
+export function getAbnormalSeizureData(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/abnormal-seizure-data',
+    method: 'get',
+    params
+  })
+}
+//异常查获数据 TOP3
+export function getAbnormalSeizureStats(params = {}) {
+  return request({
+    url: '/quality/item-category-stats/abnormal-seizure-data-top3',
+    method: 'get',
+    params
+  })
 }

src/api/system/user.js

@@ -143,3 +143,11 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+//获取所有部门和班组下人员
+export function getDeptUserTree(params) {
+  return request({
+    url: '/system/user/deptUserTree',
+    method: 'get',
+    params: params
+  })
+}

src/views/assistant/components/dataBoard.vue

@@ -23,7 +23,12 @@
     <!-- 查询表单区域 -->
     <div class="query-form">
       <div class="form-container">
-        <el-form :model="queryForm" label-width="80px">
+        <el-form :model="queryForm" label-width="80px" :inline="true">
+          <el-form-item label="统计范围">
+            <el-tree-select v-model="queryForm.deptId" :data="deptTreeOptions"
+              :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择统计范围"
+              check-strictly clearable style="width: 300px" @change="handleDeptChange" />
+          </el-form-item>
           <el-form-item label="查询时间">
             <div class="form-row">
               <div class="form-content">
@@ -60,13 +65,15 @@
     </div>
 
     <!-- 勤务组织组件 -->
-    <DutyOrganization :query-form="currentQueryParams" />
+    <DutyOrganization :query-form="currentQueryParams" :selected-dept-object="selectedDeptObject" />
 
     <!-- 质控活动组件 -->
-    <QualityControl :query-form="currentQueryParams" />
+    <QualityControl :query-form="currentQueryParams" :selected-dept-object="selectedDeptObject" />
 
     <!-- 风险隐患组件 -->
-    <RiskHazard :query-form="currentQueryParams" />
+    <RiskHazard :query-form="currentQueryParams" :selected-dept-object="selectedDeptObject" />
+    <!-- 抽问抽答组件 -->
+    <QaAnalysis :query-form="currentQueryParams" :selected-dept-object="selectedDeptObject" />
   </div>
 </template>
 
@@ -78,13 +85,20 @@ import html2canvas from 'html2canvas'
 import jsPDF from 'jspdf'
 import { Document, Packer, Paragraph, ImageRun, HeadingLevel, AlignmentType } from 'docx'
 import { saveAs } from 'file-saver'
+import { getDeptUserTree } from '@/api/system/user.js'
 import DutyOrganization from './dutyOrganization.vue'
 import QualityControl from './qualityControl.vue'
 import RiskHazard from './riskHazard.vue'
+import QaAnalysis from './qaAnalysis.vue'
 
 // 定义emit事件
 const emit = defineEmits(['back'])
-
+// 部门树状数据
+const deptTreeOptions = ref([])
+// 选中的部门对象（单独变量）
+const selectedDeptObject = ref(null)
+// 临时存储部门选择，点击查询后才赋值
+const tempSelectedDeptObject = ref(null)
 // 生成年份选项（近10年）
 const currentYear = new Date().getFullYear()
 
@@ -140,9 +154,64 @@ const handleQuery = () => {
   console.log('查询参数:', queryForm.value)
   // 将查询表单值复制到当前查询参数
   currentQueryParams.value = { ...queryForm.value }
+  // 将临时存储的部门选择赋值给 selectedDeptObject
+  selectedDeptObject.value = tempSelectedDeptObject.value
   console.log('当前查询参数已更新:', currentQueryParams.value)
+  console.log('部门对象已更新:', selectedDeptObject.value)
 }
+// 处理部门选择变化
+const handleDeptChange = (selectedId) => {
+  console.log('部门选择变化:', selectedId)
+
+  if (!selectedId) {
+    // 清空选择
+    tempSelectedDeptObject.value = null
+    console.log('已清空部门选择（临时）')
+    return
+  }
 
+  // 在部门树中查找对应的对象
+  const findDeptInTree = (nodes, targetId) => {
+    for (const node of nodes) {
+      if (node.id === targetId) {
+        return node
+      }
+      if (node.children && node.children.length > 0) {
+        const found = findDeptInTree(node.children, targetId)
+        if (found) {
+          return found
+        }
+      }
+    }
+    return null
+  }
+
+  const foundDept = findDeptInTree(deptTreeOptions.value, selectedId)
+  if (foundDept) {
+    let user = !foundDept.deptType ? { deptType: 'USER' } : {};
+    tempSelectedDeptObject.value = { ...foundDept, ...user }
+    console.log('保存的部门对象（临时）:', foundDept)
+  } else {
+    tempSelectedDeptObject.value = null
+    console.warn('未找到对应的部门对象')
+  }
+}
+
+// 获取部门树状数据
+const fetchDeptTree = async () => {
+  try {
+    const response = await getDeptUserTree({ deptId: 100 })
+    deptTreeOptions.value = response.data || []
+    console.log('部门树数据:', deptTreeOptions.value)
+    handleDeptChange(100)
+    // 部门树加载完成后，初始化默认的部门对象
+    handleQuery()
+
+  } catch (error) {
+    console.error('获取部门树状数据失败:', error)
+    ElMessage.error('获取部门数据失败')
+  }
+}
 // 重置表单
 const handleReset = () => {
   queryForm.value = {
@@ -154,6 +223,10 @@ const handleReset = () => {
   // 重置后自动查询接口
   handleQuery()
 }
+// 组件挂载时初始化
+onMounted(() => {
+  fetchDeptTree()
+})
 const handleExport = async () => {
 
   const btn = document.querySelector('.export-btn');
@@ -175,7 +248,7 @@ const handleExport = async () => {
 
     // 生成动态文档标题
     let reportTitle = '质控分析报告';
-    
+
     if (queryForm.value.year) {
       if (queryForm.value.dateRangeQueryType === 'YEAR') {
         reportTitle = `${queryForm.value.year}年质控分析报告`;
@@ -207,6 +280,28 @@ const handleExport = async () => {
       const sectionTitle = sectionTitles[i];
       const sectionName = sectionTitle.textContent;
       
+      // 检查组件是否显示（通过检查父组件的显示状态）
+      const componentContainer = sectionTitle.closest('.duty-organization, .quality-control, .risk-hazard, .qa-analysis');
+      const isComponentVisible = componentContainer && 
+        window.getComputedStyle(componentContainer).display !== 'none' &&
+        componentContainer.offsetHeight > 0 &&
+        componentContainer.offsetWidth > 0;
+
+      // 如果组件被隐藏，跳过该组件的导出
+      if (!isComponentVisible) {
+        // 跳过该组件下的所有面板项
+        while (panelIndex < panelItems.length) {
+          const panelItem = panelItems[panelIndex];
+          const panelSectionTitle = panelItem.closest('.quality-control, .duty-organization, .risk-hazard, .qa-analysis')?.querySelector('.section-title h2');
+          if (panelSectionTitle && panelSectionTitle.textContent === sectionName) {
+            panelIndex++;
+          } else {
+            break;
+          }
+        }
+        continue;
+      }
+
       // 添加组件大标题
       children.push(
         new Paragraph({
@@ -220,11 +315,18 @@ const handleExport = async () => {
       const componentPanelItems = [];
       while (panelIndex < panelItems.length) {
         const panelItem = panelItems[panelIndex];
-        
+
         // 检查这个面板项是否属于当前组件
-        const panelSectionTitle = panelItem.closest('.quality-control, .duty-organization, .risk-hazard')?.querySelector('.section-title h2');
+        const panelSectionTitle = panelItem.closest('.quality-control, .duty-organization, .risk-hazard, .qa-analysis')?.querySelector('.section-title h2');
         if (panelSectionTitle && panelSectionTitle.textContent === sectionName) {
-          componentPanelItems.push(panelItem);
+          // 检查面板项是否显示
+          const isPanelVisible = window.getComputedStyle(panelItem).display !== 'none' &&
+            panelItem.offsetHeight > 0 &&
+            panelItem.offsetWidth > 0;
+          
+          if (isPanelVisible) {
+            componentPanelItems.push(panelItem);
+          }
           panelIndex++;
         } else {
           break; // 遇到下一个组件的面板项，停止处理
@@ -234,140 +336,231 @@ const handleExport = async () => {
       // 处理当前组件下的面板项
       for (let j = 0; j < componentPanelItems.length; j++) {
         const panelItem = componentPanelItems[j];
-       
-       // 获取面板项标题
-       const titleElement = panelItem.querySelector('.panel-header h2, .panel-header h3');
-       const title = titleElement?.textContent || `图表${j + 1}`;
-       
-       // 添加面板项标题
-       children.push(
-         new Paragraph({
-           text: `${i + 1}.${j + 1} ${title}`,
-           heading: HeadingLevel.HEADING_2,
-         }),
-         new Paragraph({ text: '' }) // 在小标题后添加空行
-       );
-
-       // 获取面板项中的所有相关元素，按DOM顺序排列
-       const contentElements = panelItem.querySelectorAll('.stat-card, .describe-card, .chart-container');
-       
-       // 按DOM顺序处理每个元素
-       for (let k = 0; k < contentElements.length; k++) {
-         const element = contentElements[k];
-         
-         if (element.classList.contains('stat-card') || element.classList.contains('describe-card')) {
-           // 处理描述内容卡片
-           const description = element.textContent || '';
-           if (description) {
-             children.push(
-               new Paragraph({
-                 text: description,
-                 alignment: AlignmentType.LEFT,
-               }),
-               new Paragraph({ text: '' }) // 空行
-             );
-           }
-         } else if (element.classList.contains('chart-container')) {
-           // 处理图表容器
-           // 截图
-           const canvas = await html2canvas(element, {
-             backgroundColor: '#ffffff',
-             scale: 2, // 高清截图
-             logging: false
-           });
-
-           // 转换为 base64
-           const imageData = canvas.toDataURL('image/png');
-           const base64Data = imageData.replace(/^data:image\/png;base64,/, '');
-
-           // 计算保持宽高比的尺寸
-           const maxWidth = 500; // Word中最大宽度
-           const originalWidth = canvas.width;
-           const originalHeight = canvas.height;
-           const aspectRatio = originalWidth / originalHeight;
-
-           let finalWidth = maxWidth;
-           let finalHeight = maxWidth / aspectRatio;
-
-           // 如果高度超过限制，按高度缩放
-           const maxHeight = 400;
-           if (finalHeight > maxHeight) {
-             finalHeight = maxHeight;
-             finalWidth = maxHeight * aspectRatio;
-           }
-
-           // 添加图片（保持原始宽高比）
-           children.push(
-             new Paragraph({
-               children: [
-                 new ImageRun({
-                   data: Uint8Array.from(atob(base64Data), c => c.charCodeAt(0)),
-                   transformation: {
-                     width: Math.round(finalWidth),
-                     height: Math.round(finalHeight)
-                   }
-                 })
-               ],
-               alignment: AlignmentType.CENTER,
-             }),
-             new Paragraph({ text: '' }) // 图片后空行
-           );
-
-           // 小延迟，让UI更新
-           await new Promise(resolve => setTimeout(resolve, 100));
-         }
-       }
-
-      // 获取表格容器
-      const tableContainer = panelItem.querySelector('.table-container');
-      if (tableContainer) {
-        // 截图
-        const canvas = await html2canvas(tableContainer, {
-          backgroundColor: '#ffffff',
-          scale: 2, // 高清截图
-          logging: false
-        });
-
-        // 转换为 base64
-        const imageData = canvas.toDataURL('image/png');
-        const base64Data = imageData.replace(/^data:image\/png;base64,/, '');
-
-        // 计算保持宽高比的尺寸
-        const maxWidth = 500; // Word中最大宽度
-        const originalWidth = canvas.width;
-        const originalHeight = canvas.height;
-        const aspectRatio = originalWidth / originalHeight;
-
-        let finalWidth = maxWidth;
-        let finalHeight = maxWidth / aspectRatio;
-
-        // 如果高度超过限制，按高度缩放
-        const maxHeight = 400;
-        if (finalHeight > maxHeight) {
-          finalHeight = maxHeight;
-          finalWidth = maxHeight * aspectRatio;
-        }
 
-        // 添加表格图片（保持原始宽高比）
+        // 获取面板项标题
+        const titleElement = panelItem.querySelector('.panel-header h2, .panel-header h3');
+        const title = titleElement?.textContent || `图表${j + 1}`;
+
+        // 添加面板项标题
         children.push(
           new Paragraph({
-            children: [
-              new ImageRun({
-                data: Uint8Array.from(atob(base64Data), c => c.charCodeAt(0)),
-                transformation: {
-                  width: Math.round(finalWidth),
-                  height: Math.round(finalHeight)
-                }
-              })
-            ],
-            alignment: AlignmentType.CENTER,
+            text: `${i + 1}.${j + 1} ${title}`,
+            heading: HeadingLevel.HEADING_2,
           }),
-          new Paragraph({ text: '' }) // 图片后空行
+          new Paragraph({ text: '' }) // 在小标题后添加空行
         );
 
-        // 小延迟，让UI更新
-        await new Promise(resolve => setTimeout(resolve, 100));
-      }
+        // 获取面板项中的所有相关元素，按DOM顺序排列
+        const contentElements = panelItem.querySelectorAll('.stat-card, .describe-card, .chart-container');
+
+        // 按DOM顺序处理每个元素
+        for (let k = 0; k < contentElements.length; k++) {
+          const element = contentElements[k];
+
+          // 检查元素是否实际可见（包括检查父容器）
+          const isElementVisible = window.getComputedStyle(element).display !== 'none' &&
+            element.offsetHeight > 0 &&
+            element.offsetWidth > 0;
+
+          if (!isElementVisible) {
+            console.warn('元素被隐藏，跳过:', element.classList);
+            continue;
+          }
+
+          if (element.classList.contains('stat-card') || element.classList.contains('describe-card')) {
+            // 处理描述内容卡片
+            const description = element.textContent || '';
+            if (description && description.trim() !== '') {
+              children.push(
+                new Paragraph({
+                  text: description,
+                  alignment: AlignmentType.LEFT,
+                }),
+                new Paragraph({ text: '' }) // 空行
+              );
+            }
+          } else if (element.classList.contains('chart-container')) {
+            // 处理图表容器
+            // 截图
+            const canvas = await html2canvas(element, {
+              backgroundColor: '#ffffff',
+              scale: 2, // 高清截图
+              logging: false
+            });
+
+            // 转换为 base64
+            const imageData = canvas.toDataURL('image/png');
+            const base64Data = imageData.replace(/^data:image\/png;base64,/, '');
+
+            // 验证 base64 数据格式
+            if (!base64Data || base64Data.trim() === '') {
+              console.warn('截图数据为空，跳过该图表');
+              continue;
+            }
+
+            // 计算保持宽高比的尺寸
+            const maxWidth = 500; // Word中最大宽度
+            const originalWidth = canvas.width;
+            const originalHeight = canvas.height;
+            const aspectRatio = originalWidth / originalHeight;
+
+            let finalWidth = maxWidth;
+            let finalHeight = maxWidth / aspectRatio;
+
+            // 如果高度超过限制，按高度缩放
+            const maxHeight = 400;
+            if (finalHeight > maxHeight) {
+              finalHeight = maxHeight;
+              finalWidth = maxHeight * aspectRatio;
+            }
+
+            // 添加图片（保持原始宽高比）
+            try {
+              const imageBytes = Uint8Array.from(atob(base64Data), c => c.charCodeAt(0));
+              children.push(
+                new Paragraph({
+                  children: [
+                    new ImageRun({
+                      data: imageBytes,
+                      transformation: {
+                        width: Math.round(finalWidth),
+                        height: Math.round(finalHeight)
+                      }
+                    })
+                  ],
+                  alignment: AlignmentType.CENTER,
+                }),
+                new Paragraph({ text: '' }) // 图片后空行
+              );
+            } catch (error) {
+              console.error('图片数据处理失败:', error);
+              // 跳过该图表，继续处理其他内容
+              continue;
+            }
+
+            // 小延迟，让UI更新
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        }
+
+        // 获取表格容器
+        const tableContainer = panelItem.querySelector('.table-container');
+        if (tableContainer) {
+          // 临时移除表格容器的高度和宽度限制，让表格显示所有内容
+          const originalMaxHeight = tableContainer.style.maxHeight || '';
+          const originalOverflowY = tableContainer.style.overflowY || '';
+          const originalOverflowX = tableContainer.style.overflowX || '';
+          const originalTableContainerWidth = tableContainer.style.width || '';
+
+          tableContainer.style.maxHeight = 'none';
+          tableContainer.style.overflowY = 'visible';
+          tableContainer.style.overflowX = 'visible';
+          tableContainer.style.width = '800px'; // 统一表格容器宽度
+
+          // 临时移除表格的高度和宽度属性，让Element Plus表格显示所有行和列
+          const tableElement = tableContainer.querySelector('.el-table');
+          let originalTableHeight = '';
+          let originalTableWidth = '';
+          if (tableElement) {
+            originalTableHeight = tableElement.style.height || '';
+            originalTableWidth = tableElement.style.width || '';
+            tableElement.style.height = 'auto';
+            tableElement.style.width = '800px'; // 统一表格宽度
+
+            // 临时移除表格内部滚动容器的限制
+            const bodyWrapper = tableElement.querySelector('.el-table__body-wrapper');
+            if (bodyWrapper) {
+              bodyWrapper.style.overflowX = 'visible';
+              bodyWrapper.style.overflowY = 'visible';
+            }
+          }
+
+          // 等待DOM更新
+          await new Promise(resolve => setTimeout(resolve, 200));
+
+          // 截图 - 使用固定宽度确保所有表格宽度一致
+          const canvas = await html2canvas(tableContainer, {
+            backgroundColor: '#ffffff',
+            scale: 1.5, // 适当降低缩放比例以避免图片过大
+            logging: false,
+            useCORS: true,
+            allowTaint: true,
+            scrollX: 0, // 确保从最左侧开始截图
+            scrollY: 0, // 确保从最顶部开始截图
+            width: 800, // 固定宽度，确保所有表格宽度一致
+            height: tableContainer.scrollHeight // 使用完整高度
+          });
+
+          // 恢复原始样式
+          tableContainer.style.maxHeight = originalMaxHeight;
+          tableContainer.style.overflowY = originalOverflowY;
+          tableContainer.style.overflowX = originalOverflowX;
+          tableContainer.style.width = originalTableContainerWidth;
+
+          if (tableElement) {
+            tableElement.style.height = originalTableHeight;
+            tableElement.style.width = originalTableWidth;
+
+            const bodyWrapper = tableElement.querySelector('.el-table__body-wrapper');
+            if (bodyWrapper) {
+              bodyWrapper.style.overflowX = '';
+              bodyWrapper.style.overflowY = '';
+            }
+          }
+
+          // 转换为 base64
+          const imageData = canvas.toDataURL('image/png');
+          const base64Data = imageData.replace(/^data:image\/png;base64,/, '');
+
+          // 验证 base64 数据格式
+          if (!base64Data || base64Data.trim() === '') {
+            console.warn('表格截图数据为空，跳过该表格');
+            continue;
+          }
+
+          // 计算保持宽高比的尺寸
+          const maxWidth = 500; // Word中最大宽度
+          const originalWidth = canvas.width;
+          const originalHeight = canvas.height;
+          const aspectRatio = originalWidth / originalHeight;
+
+          let finalWidth = maxWidth;
+          let finalHeight = maxWidth / aspectRatio;
+
+          // 如果高度超过限制，按高度缩放
+          const maxHeight = 400;
+          if (finalHeight > maxHeight) {
+            finalHeight = maxHeight;
+            finalWidth = maxHeight * aspectRatio;
+          }
+
+          // 添加表格图片（保持原始宽高比）
+          try {
+            const imageBytes = Uint8Array.from(atob(base64Data), c => c.charCodeAt(0));
+            children.push(
+              new Paragraph({
+                children: [
+                  new ImageRun({
+                    data: imageBytes,
+                    transformation: {
+                      width: Math.round(finalWidth),
+                      height: Math.round(finalHeight)
+                    }
+                  })
+                ],
+                alignment: AlignmentType.CENTER,
+              }),
+              new Paragraph({ text: '' }) // 图片后空行
+            );
+          } catch (error) {
+            console.error('表格图片数据处理失败:', error);
+            // 跳过该表格，继续处理其他内容
+            continue;
+          }
+
+          // 小延迟，让UI更新
+          await new Promise(resolve => setTimeout(resolve, 100));
+        }
       }
     }
 

src/views/assistant/components/dutyOrganization.vue

@@ -16,7 +16,9 @@
         <!-- 统计卡片 -->
         <div class="stat-card">
           <div class="stat-content">
-            全站出勤<span>{{ attendanceData && attendanceData.length > 3 ? attendanceData[3]?.currentValue : 0
+            {{ attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length -
+              1]?.deptName : ''
+            }}出勤<span>{{ attendanceData && attendanceData.length > 3 ? attendanceData[3]?.currentValue : 0
             }}</span>人次，同比
             <span
               :class="getTrendClass(attendanceData && attendanceData.length > 3 ? attendanceData[3]?.yearOnYearValue : 0)">{{
@@ -128,6 +130,10 @@ const props = defineProps({
       quarter: '',
       month: ''
     })
+  },
+  selectedDeptObject: {
+    type: Object,
+    default: null
   }
 })
 
@@ -146,6 +152,10 @@ const attendanceData = ref({})
 const trendData = ref({})
 const qualificationPieData = ref({})
 const qualificationBarData = ref({})
+// 计算属性：处理selectedDeptObject逻辑
+const selectedDeptType = computed(() => {
+  return props.selectedDeptObject && props.selectedDeptObject?.deptType
+})
 
 // 计算属性：动态生成资质等级分布描述第一部分（句号前）
 const qualificationPieDescriptionPart1 = computed(() => {
@@ -259,24 +269,30 @@ const fetchDutyOrganizationData = async (queryParams) => {
   try {
     // 处理query参数
     const processedParams = processQueryParams(queryParams)
+    const selectedDept = props.selectedDeptObject
+    const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
 
+    let calculateParams = {
+      ...(['TEAMS', 'DEPARTMENT','BRIGADE'].includes(deptType) ? { deptId: id } : {}),
+      ...(deptType == 'USER' ? { userId: id } : {})
+    }
     // 获取出勤人次分析数据
-    const attendanceResponse = await getCalculate(processedParams)
+    const attendanceResponse = await getCalculate({ ...processedParams, ...calculateParams })
     console.log('出勤人次分析数据:', attendanceResponse)
     attendanceData.value = attendanceResponse || []
 
     // 获取出勤人次趋势数据
-    const trendResponse = await getCalculateTrendData(processedParams)
+    const trendResponse = await getCalculateTrendData({ ...processedParams, ...calculateParams })
     console.log('出勤人次趋势数据:', trendResponse)
     trendData.value = trendResponse || []
 
     // 获取资质等级分布饼图数据
-    const pieResponse = await getQualificationPieChart(processedParams)
+    const pieResponse = await getQualificationPieChart({ ...processedParams, ...calculateParams })
     console.log('资质等级分布饼图数据:', pieResponse)
     qualificationPieData.value = pieResponse.data || []
 
     // 获取资质等级分布柱状图数据
-    const barResponse = await getQualificationBarChart(processedParams)
+    const barResponse = await getQualificationBarChart({ ...processedParams, ...calculateParams })
     console.log('资质等级分布柱状图数据:', barResponse)
     qualificationBarData.value = barResponse.data?.brigades || []
 
@@ -294,7 +310,7 @@ watch(() => props.queryForm, (newQueryForm) => {
   if (newQueryForm.dateRangeQueryType && newQueryForm.year) {
     fetchDutyOrganizationData(newQueryForm)
   }
-}, { deep: true, immediate: true })
+}, { deep: true })
 
 // 饼图配置
 const pieOptions = {
@@ -708,7 +724,7 @@ const updateTrendBarChart = () => {
 const updateAttendanceBarChart = () => {
   if (trendData.value && Array.isArray(trendData.value)) {
     const trendList = trendData.value
-    
+
     // 提取横坐标数据（timeLabel字段）
     const xAxisData = trendList.map(item => item.timeLabel || '未知时间')
 

src/views/assistant/components/qaAnalysis.vue

@@ -0,0 +1,761 @@
+<template>
+  <div class="qa-analysis">
+    <!-- 抽问抽答标题 -->
+    <div class="section-title">
+      <h2>抽问抽答</h2>
+    </div>
+
+    <!-- 三个横向均分的内容区域 -->
+    <div class="three-panel-layout">
+      <!-- 第一个：答题完成趋势 -->
+      <div class="panel-item">
+        <div class="panel-header">
+          <h3>答题完成趋势</h3>
+        </div>
+
+        <!-- 描述卡片 -->
+        <div class="describe-card">
+          <div class="describe-content">
+            {{ completionTrendDescription }}
+          </div>
+        </div>
+
+        <!-- 折线图 -->
+        <div class="chart-container">
+          <div ref="completionTrendChartRef" class="echarts-chart"></div>
+        </div>
+      </div>
+
+      <!-- 第二个：错题分布 -->
+      <div class="panel-item">
+        <div class="panel-header">
+          <h3>错题分布</h3>
+        </div>
+
+        <!-- 描述卡片 -->
+        <div class="describe-card">
+          <div class="describe-content">
+            {{ errorDistributionDescription }}
+          </div>
+        </div>
+
+        <!-- 饼图 -->
+        <div class="chart-container">
+          <div ref="errorDistributionChartRef" class="echarts-chart"></div>
+        </div>
+      </div>
+
+      <!-- 第三个：各科错题分布对比 -->
+      <div class="panel-item" v-show="isStationType">
+        <div class="panel-header">
+          <h3>各科错题分布对比</h3>
+        </div>
+
+        <!-- 描述卡片 -->
+        <div class="describe-card">
+          <div class="describe-content">
+            {{ departmentComparisonDescription }}
+          </div>
+        </div>
+
+        <!-- 雷达图 -->
+        <div class="chart-container">
+          <div ref="departmentComparisonChartRef" class="echarts-chart"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, watch, computed } from 'vue'
+import { useEcharts } from '@/hooks/chart.js'
+import useUserStore from '@/store/modules/user'
+import { getCompletionTrend, getWrongAnalysisOverview, getWrongAnalysisRadar } from '@/api/assistant/assistant.js'
+
+const userStore = useUserStore()
+
+// 计算属性：用户角色
+const role = computed(() => {
+  return userStore.roles || []
+})
+
+// 定义props接收queryForm参数
+const props = defineProps({
+  queryForm: {
+    type: Object,
+    default: () => ({
+      dateRangeQueryType: '',
+      year: '',
+      quarter: '',
+      month: ''
+    })
+  },
+  selectedDeptObject: {
+    type: Object,
+    default: null
+  }
+})
+
+// 计算属性：处理selectedDeptObject逻辑
+const selectedDeptType = computed(() => {
+  return props.selectedDeptObject && props.selectedDeptObject?.deptType
+})
+
+const selectedDeptName = computed(() => {
+
+  return props.selectedDeptObject && props.selectedDeptObject?.label
+})
+
+// 计算属性：检查是否为STATION类型
+const isStationType = computed(() => {
+  return selectedDeptType.value === 'STATION' || !selectedDeptType.value
+})
+
+// 统一的参数处理函数
+const processQueryParams = (queryParams) => {
+  const processedParams = { ...queryParams }
+
+  // 根据部门类型添加相应的参数
+  const selectedDept = props.selectedDeptObject
+  const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
+  processedParams.scopeType = deptType === 'STATION' ? 'STATION' : deptType == 'DEPARTMENT' ? 'DEPT' : deptType == 'TEAMS' ? 'TEAM' : deptType == 'USER' ? 'USER' : ''
+  processedParams.scopeId = id
+  delete processedParams.deptId;
+  delete processedParams.teamId;
+  delete processedParams.userId;
+
+  return processedParams
+}
+
+// 图表容器引用
+const completionTrendChartRef = ref(null)
+const errorDistributionChartRef = ref(null)
+const departmentComparisonChartRef = ref(null)
+
+// 图表实例
+const { setOption: setCompletionTrendOption, dispose: disposeCompletionTrend } = useEcharts(completionTrendChartRef)
+const { setOption: setErrorDistributionOption, dispose: disposeErrorDistribution } = useEcharts(errorDistributionChartRef)
+const { setOption: setDepartmentComparisonOption, dispose: disposeDepartmentComparison } = useEcharts(departmentComparisonChartRef)
+
+
+
+
+
+// 描述卡片文本变量
+const completionTrendDescription = ref('')
+const errorDistributionDescription = ref('')
+const departmentComparisonDescription = ref('')
+
+// API数据处理函数
+const processApiData = (apiData) => {
+  console.log('processApiData', apiData);
+
+  // 根据API返回的数据结构进行处理
+  if (!apiData || !apiData.model) {
+    return { processedData: [], xAxisData: [] };
+  }
+
+  const { xAxis, series } = apiData.model;
+
+  // 处理x轴数据
+  const xAxisData = xAxis || [];
+
+  // 处理系列数据
+  const processedData = [];
+
+  if (series && series.length > 0) {
+    // 如果是站长角色，显示多条线；如果是科长角色，显示单条线
+    // 这里简化处理，只显示第一条线
+    for (let i = 0; i < series.length; i++) {
+      // 确保数据是数值类型
+      const numericData = series[i].data.map(item => {
+        if (typeof item === 'string') {
+          return parseFloat(item) || 0;
+        }
+        return Number(item) || 0;
+      });
+
+      processedData.push({
+        name: series[i].name,
+        type: 'line',
+        data: numericData,
+
+      });
+    }
+  }
+
+  return { processedData, xAxisData };
+}
+
+// 处理总体问题分布数据（饼图）
+const processOverviewData = (apiData) => {
+  const { categories } = apiData.model;
+
+  if (!categories.length) return [];
+
+  return categories.map(category => ({
+    id: category.id,
+    value: category.count,
+    name: category.name,
+
+  }));
+}
+
+// 处理雷达图数据
+const processRadarData = (apiData) => {
+  const { indicators, series } = apiData.model;
+
+  if (!apiData || !indicators || !series) return [];
+
+  return { indicators, series }
+}
+
+// 获取答题完成趋势数据
+const fetchCompletionTrendData = async () => {
+  try {
+    // 使用统一的参数处理函数
+    const processedParams = processQueryParams(props.queryForm)
+    const response = await getCompletionTrend(processedParams);
+    const { processedData, xAxisData } = processApiData(response);
+
+    let stationData = processedData.find(item => item.name === '全站')?.data || 0;
+
+
+    // 找到除了全站之外的其他科室数据
+    const otherDepartments = processedData.filter(item => item.name !== '全站');
+
+    let maxData = null;
+    let maxDataPercent = '0.00';
+
+    if (otherDepartments.length > 0) {
+      // 如果有其他科室数据，找出完成人数最多的科室
+      maxData = otherDepartments.reduce((max, item) => {
+        if (item.data[2] > max.data[2]) {
+          return item;
+        }
+        return max;
+      }, otherDepartments[0]);
+
+      // 防止除数为0或NaN
+      const stationLastValue = stationData[stationData.length - 1] || 0;
+      if (stationLastValue > 0) {
+        maxDataPercent = ((maxData.data[maxData.data.length - 1] / stationLastValue) * 100).toFixed(2);
+      } else {
+        maxDataPercent = '0.00';
+      }
+    }
+
+    //计算同比
+    console.log('maxData', maxData)
+
+    // 安全获取数组元素，防止NaN
+    const lastValue = stationData[stationData.length - 1] || 0;
+    const firstValue = stationData[0] || 0;
+    const secondValue = stationData[1] || 0;
+
+    // 计算同比
+    let tongValue = 0;
+    if (firstValue > 0) {
+      tongValue = ((lastValue - firstValue) / firstValue) * 100;
+    }
+    let tong = firstValue === 0 ? '--' : (tongValue > 0 ? '+' : '') + tongValue.toFixed(2);
+
+    // 计算环比
+    let huanValue = 0;
+    if (secondValue > 0) {
+      huanValue = ((lastValue - secondValue) / secondValue) * 100;
+    }
+    let huan = secondValue === 0 ? '--' : (huanValue > 0 ? '+' : '') + huanValue.toFixed(2);
+    // 安全获取maxData数组元素，防止NaN
+    const maxDataLastValue = maxData.data[maxData.data.length - 1] || 0;
+    const maxDataFirstValue = maxData.data[0] || 0;
+    const maxDataSecondValue = maxData.data[1] || 0;
+    // 为maxData也计算同比和环比
+    let maxDataTong = '--';
+    let maxDataHuan = '--';
+    if (maxData && maxData.data) {
+
+
+      // 计算maxData同比
+      let maxDataTongValue = 0;
+      if (maxDataFirstValue > 0) {
+        maxDataTongValue = ((maxDataLastValue - maxDataFirstValue) / maxDataFirstValue) * 100;
+      }
+      maxDataTong = maxDataFirstValue === 0 ? '--' : (maxDataTongValue > 0 ? '+' : (maxDataTongValue < 0 ? '' : '')) + maxDataTongValue.toFixed(2);
+
+      // 计算maxData环比
+      let maxDataHuanValue = 0;
+      if (maxDataSecondValue > 0) {
+        maxDataHuanValue = ((maxDataLastValue - maxDataSecondValue) / maxDataSecondValue) * 100;
+      }
+      maxDataHuan = maxDataSecondValue === 0 ? '--' : (maxDataHuanValue > 0 ? '+' : (maxDataHuanValue < 0 ? '' : '')) + maxDataHuanValue.toFixed(2);
+    }
+
+    // 根据查询条件决定显示内容
+    let descriptionText = '';
+    let totalPerson = stationData[stationData.length - 1] || 0;
+    if (maxData) {
+      // 有其他科室数据时显示科室信息
+      if (props.queryForm.dateRangeQueryType === 'YEAR') {
+        const firstYearStr = isStationType.value ? `${selectedDeptName.value}共答题${totalPerson}人次，同比${tong}%，` : '';
+        const secondYearStr = isStationType.value ? `${maxData.name}共答题${maxData.data[maxData.data.length - 1]}人次，占比最高为${maxDataPercent}%。` : `${selectedDeptName.value}完成${maxDataLastValue}人次，同比${maxDataTong}%。`
+        // 年查询：只显示同比，隐藏环比
+        descriptionText = `${firstYearStr}${secondYearStr}`;
+      } else {
+        const firstNotYearStr = isStationType.value ? `${selectedDeptName.value}共答题${totalPerson}人次，同比${tong}%，环比${huan}%，` : '';
+        const secondNotYearStr = isStationType.value ? `${maxData.name}共答题${maxData.data[maxData.data.length - 1]}人次，占比最高为${maxDataPercent}%。` : `${selectedDeptName.value}完成${maxDataLastValue}人次，同比${maxDataTong}%，环比${maxDataHuan}%。`
+        // 季度或月查询：显示同比和环比
+        descriptionText = `${firstNotYearStr}${secondNotYearStr}`;
+      }
+    } else {
+      // 只有全站数据时显示简化的描述
+      if (props.queryForm.dateRangeQueryType === 'YEAR') {
+        descriptionText = `${selectedDeptName.value}共答题${totalPerson}人次，同比${tong}%。`;
+      } else {
+        descriptionText = `${selectedDeptName.value}共答题${totalPerson}人次，同比${tong}%，环比${huan}%。`;
+      }
+    }
+
+    // 设置描述卡片文本
+    completionTrendDescription.value = descriptionText;
+    let data = processedData.map(series => ({
+      ...series,
+      symbol: 'circle', // 添加数据点标记
+      symbolSize: 6,
+      smooth: true,
+      lineStyle: {
+        width: 3
+      },
+    }))
+
+    // 更新答题完成趋势图表
+    setCompletionTrendOption({
+      tooltip: {
+        trigger: 'axis'
+      },
+      legend: {
+        data: processedData.map(item => item.name)
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: xAxisData
+      },
+      yAxis: {
+        type: 'value'
+        // 移除min/max限制，让ECharts自动计算范围
+      },
+      series: data
+    }, true);
+  } catch (error) {
+    console.error('获取答题完成趋势数据失败:', error);
+    // 使用默认数据作为后备
+    setCompletionTrendOption({
+      tooltip: {
+        trigger: 'axis'
+      },
+      legend: {
+        data: ['完成率']
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+      },
+      yAxis: {
+        type: 'value',
+        min: 70,
+        max: 100
+      },
+      series: [
+        {
+          name: '完成率',
+          type: 'line',
+          smooth: true,
+          data: [85, 88, 92, 90, 87, 89, 91, 93, 95, 94, 92, 90],
+          itemStyle: {
+            color: '#5470c6'
+          }
+        }
+      ]
+    });
+  }
+}
+
+// 获取错题分布数据（饼图）
+const fetchWrongAnalysisOverviewData = async () => {
+  try {
+    // 使用统一的参数处理函数
+    const processedParams = processQueryParams(props.queryForm)
+    const response = await getWrongAnalysisOverview(processedParams);
+    const pieData = processOverviewData(response);
+    console.log('fetchWrongAnalysisOverviewData', pieData);
+    let sortData = pieData.sort((a, b) => b.value - a.value);
+    let total = pieData.reduce((acc, cur) => acc + cur.value, 0);
+    console.log('total', (sortData[0]?.value / total) * 100)
+    // 设置描述卡片文本
+    const firstPercentage = ((sortData[0]?.value / total) * 100);
+    const secondPercentage = ((sortData[1]?.value / total) * 100);
+
+    errorDistributionDescription.value = `错题主要集中于：${sortData[0]?.name || '--'}，占比：${isNaN(firstPercentage) ? '--' : firstPercentage.toFixed(2)}%；其次为：${sortData[1]?.name || '--'}，占比：${isNaN(secondPercentage) ? '--' : secondPercentage.toFixed(2)}%，为靶向培训、题库优化提供核心依据。`
+
+    // 更新错题分布饼图
+    setErrorDistributionOption({
+      tooltip: {
+        trigger: 'item'
+      },
+      legend: {
+        orient: 'vertical',
+        left: 10,
+        top: 'center'
+      },
+
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b}: {c} ({d}%)'
+      },
+      series: [
+        {
+          name: '错题分布',
+          type: 'pie',
+          radius: ['40%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderRadius: 10,
+            borderColor: '#fff',
+            borderWidth: 2
+          },
+
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 12,
+              fontWeight: 'bold'
+            }
+          },
+          label: {
+            show: true,
+            formatter: '{b}\n{c} ({d}%)',
+            fontSize: 12,
+            fontWeight: 'normal'
+          },
+          labelLine: {
+            show: true,
+            length: 10,
+            length2: 20
+          },
+          data: pieData
+        }
+      ]
+    });
+  } catch (error) {
+    console.error('获取错题分布数据失败:', error);
+    // 使用默认数据作为后备
+    setErrorDistributionOption({
+      tooltip: {
+        trigger: 'item'
+      },
+      legend: {
+        orient: 'vertical',
+        right: 10,
+        top: 'center'
+      },
+      series: [
+        {
+          name: '错题分布',
+          type: 'pie',
+          radius: ['40%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderRadius: 10,
+            borderColor: '#fff',
+            borderWidth: 2
+          },
+          label: {
+            show: false,
+            position: 'center'
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 12,
+              fontWeight: 'bold'
+            }
+          },
+          labelLine: {
+            show: false
+          },
+          data: [
+            { value: 45.3, name: '操作执行类' },
+            { value: 28.7, name: '设施设备类' },
+            { value: 15.2, name: '勤务组织类' },
+            { value: 8.4, name: '安全知识类' },
+            { value: 2.4, name: '其他' }
+          ]
+        }
+      ]
+    });
+  }
+}
+// 计算雷达图数据的最大值
+const calculateRadarMaxValue = (radarData) => {
+  if (!radarData || radarData === 0) return 100;
+
+  let maxValue = 0;
+
+  // 遍历所有雷达图数据系列，找出最大值
+  radarData.forEach(series => {
+    if (series.data && Array.isArray(series.data)) {
+      const seriesMax = Math.max(...series.data);
+      if (seriesMax > maxValue) {
+        maxValue = seriesMax;
+      }
+    }
+  });
+
+
+  return maxValue
+}
+// 获取各科错题分布对比数据（雷达图）
+const fetchWrongAnalysisRadarData = async () => {
+  try {
+    // 使用统一的参数处理函数
+    const processedParams = processQueryParams(props.queryForm)
+    const response = await getWrongAnalysisRadar(processedParams);
+    const radarData = processRadarData(response);
+    let max = calculateRadarMaxValue(radarData.series)
+    // console.log('fetchWrongAnalysisRadarData', radarData);
+    // debugger
+    const series = radarData.series.map(ele => {
+      if (ele.data.every(item => item === 0)) {
+        return ''
+      }
+      let maxIndex = ele.data.indexOf(Math.max(...ele.data))
+      return `${ele.name}：问题主要集中于${radarData.indicators[maxIndex]}`
+
+    }).filter(element => !!element).join('；')
+
+
+    // 设置描述卡片文本
+    departmentComparisonDescription.value = `${series}${series.length > 0 ? '，' : '暂无问题'}，可精准识别科室管理短板，分配质控资源。`
+
+    // 更新各科错题分布对比雷达图
+    setDepartmentComparisonOption({
+      tooltip: {
+        trigger: 'item'
+      },
+      legend: {
+        show: true,
+        orient: 'vertical',
+        left: 10,
+        top: 'center'
+      },
+      radar: {
+        indicator: radarData.indicators.map(indicator => ({
+          name: indicator,
+          max: max || 100
+        }))
+      },
+      series: [
+        {
+          type: 'radar',
+          data: radarData.series.map(seriesItem => ({
+            value: seriesItem.data,
+            name: seriesItem.name,
+            // areaStyle: {
+            //   color: seriesItem.color || 'rgba(84, 112, 198, 0.3)'
+            // },
+            // lineStyle: {
+            //   color: seriesItem.lineColor || '#5470c6'
+            // }
+          })),
+          areaStyle: {
+
+          },
+
+        }
+      ]
+    });
+  } catch (error) {
+    console.error('获取各科错题分布对比数据失败:', error);
+    // 使用默认数据作为后备
+    setDepartmentComparisonOption({
+      tooltip: {
+        trigger: 'item'
+      },
+      radar: {
+        indicator: [
+          { name: '操作执行类', max: 100 },
+          { name: '设施设备类', max: 100 },
+          { name: '勤务组织类', max: 100 },
+          { name: '安全知识类', max: 100 },
+          { name: '其他', max: 100 }
+        ]
+      },
+      series: [
+        {
+          type: 'radar',
+          data: [
+            {
+              value: [85, 45, 30, 60, 10],
+              name: '旅检一科',
+              areaStyle: {
+                color: 'rgba(84, 112, 198, 0.3)'
+              },
+              lineStyle: {
+                color: '#5470c6'
+              }
+            },
+            {
+              value: [40, 80, 55, 70, 15],
+              name: '旅检二科',
+              areaStyle: {
+                color: 'rgba(91, 192, 222, 0.3)'
+              },
+              lineStyle: {
+                color: '#5bc0de'
+              }
+            },
+            {
+              value: [35, 50, 90, 45, 20],
+              name: '旅检三科',
+              areaStyle: {
+                color: 'rgba(240, 173, 78, 0.3)'
+              },
+              lineStyle: {
+                color: '#f0ad4e'
+              }
+            }
+          ]
+        }
+      ]
+    });
+  }
+}
+
+// 初始化图表
+const initCharts = () => {
+  // 获取答题完成趋势数据
+  fetchCompletionTrendData();
+
+  // 获取错题分布数据（饼图）
+  fetchWrongAnalysisOverviewData();
+
+  // 获取各科错题分布对比数据（雷达图）
+  if (selectedDeptType.value === 'STATION' || !selectedDeptType.value) {
+    fetchWrongAnalysisRadarData()
+  }
+}
+
+// 监听查询参数变化
+watch(() => props.queryForm, (newVal) => {
+  console.log('Q&A分析组件接收到新的查询参数:', newVal)
+
+  // 重新获取所有图表数据
+  fetchCompletionTrendData()
+  fetchWrongAnalysisOverviewData()
+  if (selectedDeptType.value === 'STATION' || !selectedDeptType.value) {
+    fetchWrongAnalysisRadarData()
+  }
+
+}, { deep: true })
+
+// 组件挂载时初始化
+onMounted(() => {
+  initCharts()
+})
+
+// 组件卸载时清理
+onUnmounted(() => {
+  disposeCompletionTrend()
+  disposeErrorDistribution()
+  disposeDepartmentComparison()
+})
+</script>
+
+<style scoped>
+.qa-analysis {
+  margin-bottom: 20px;
+}
+
+.section-title {
+  margin: 14px 0 14px 0;
+
+  /* border-bottom: 2px solid #e8e8e8; */
+}
+
+.section-title h2 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+}
+
+.three-panel-layout {
+  display: flex;
+  gap: 20px;
+}
+
+.panel-item {
+  flex: 1;
+  background: #fff;
+  border-radius: 8px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.panel-header h3 {
+  margin: 0 0 12px 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.describe-card {
+  background: #F8F8F8;
+  border: 1px dashed #CDCCCC;
+  border-radius: 6px;
+  padding: 7px 10px;
+  text-align: left;
+  margin-bottom: 10px;
+}
+
+.describe-content {
+  font-size: 13px;
+  color: #666;
+  line-height: 1.5;
+}
+
+.chart-container {
+  height: 300px;
+}
+
+.echarts-chart {
+  width: 100%;
+  height: 100%;
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .three-panel-layout {
+    flex-direction: column;
+  }
+
+  .panel-item {
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/assistant/components/qualityControl.vue

@@ -8,7 +8,7 @@
     <!-- 四个横向均分的内容区域 -->
     <div class="four-panel-layout">
       <!-- 第一个：任务计划安排统计 -->
-      <div class="panel-item">
+      <div class="panel-item" v-show="!isTeamType && !isUserType">
         <div class="panel-header">
           <h3>任务计划安排统计</h3>
         </div>
@@ -118,6 +118,10 @@ const props = defineProps({
       quarter: '',
       month: ''
     })
+  },
+  selectedDeptObject: {
+    type: Object,
+    default: null
   }
 })
 
@@ -133,7 +137,30 @@ const { setOption: setPlanScheduleOption, dispose: disposePlanSchedule } = useEc
 const { setOption: setProblemDiscoveryOption, dispose: disposeProblemDiscovery } = useEcharts(problemDiscoveryChartRef)
 const { setOption: setProblemDistributionOption, dispose: disposeProblemDistribution } = useEcharts(problemDistributionChartRef)
 const { setOption: setProblemRectificationOption, dispose: disposeProblemRectification } = useEcharts(problemRectificationChartRef)
+// 计算属性：处理selectedDeptObject逻辑
+const selectedDeptType = computed(() => {
+  return props.selectedDeptObject && props.selectedDeptObject?.deptType
+})
+const isUserType = computed(() => {
+  return selectedDeptType.value === 'USER'
+})
 
+const isTeamType = computed(() => {
+  return selectedDeptType.value === 'TEAMS'
+})
+
+// 计算属性：检查是否为STATION类型
+const isStationType = computed(() => {
+  return selectedDeptType.value === 'STATION' || !selectedDeptType.value
+})
+
+// 计算属性：检查是否为DEPARTMENT类型
+const isDepartmentType = computed(() => {
+  return selectedDeptType.value === 'DEPARTMENT'
+})
+const isBrigadeType = computed(() => {
+  return selectedDeptType.value === 'BRIGADE'
+})
 
 // 解析desc数据并更新专项任务和日常任务数据
 const parseTaskData = (desc) => {
@@ -156,7 +183,7 @@ const parseTaskData = (desc) => {
         const trendValue = yearOnYearMatch[2]
         let trendType = 'neutral'
         let displayValue = trendValue
-        
+
         // 处理趋势值为"--"的情况
         if (trendValue === '--') {
           trendType = 'neutral'
@@ -172,7 +199,7 @@ const parseTaskData = (desc) => {
             trendType = 'neutral'
           }
         }
-        
+
         specialTask.value.yearOnYearTrend = trendType
         specialTask.value.yearOnYear = displayValue + '%'
       }
@@ -181,7 +208,7 @@ const parseTaskData = (desc) => {
         const trendValue = chainRatioMatch[2]
         let trendType = 'neutral'
         let displayValue = trendValue
-        
+
         // 处理趋势值为"--"的情况
         if (trendValue === '--') {
           trendType = 'neutral'
@@ -197,7 +224,7 @@ const parseTaskData = (desc) => {
             trendType = 'neutral'
           }
         }
-        
+
         specialTask.value.chainRatioTrend = trendType
         specialTask.value.chainRatio = displayValue + '%'
       }
@@ -214,7 +241,7 @@ const parseTaskData = (desc) => {
         const trendValue = yearOnYearMatch[2]
         let trendType = 'neutral'
         let displayValue = trendValue
-        
+
         // 处理趋势值为"--"的情况
         if (trendValue === '--') {
           trendType = 'neutral'
@@ -230,7 +257,7 @@ const parseTaskData = (desc) => {
             trendType = 'neutral'
           }
         }
-        
+
         dailyTask.value.yearOnYearTrend = trendType
         dailyTask.value.yearOnYear = displayValue + '%'
       }
@@ -239,7 +266,7 @@ const parseTaskData = (desc) => {
         const trendValue = chainRatioMatch[2]
         let trendType = 'neutral'
         let displayValue = trendValue
-        
+
         // 处理趋势值为"--"的情况
         if (trendValue === '--') {
           trendType = 'neutral'
@@ -255,7 +282,7 @@ const parseTaskData = (desc) => {
             trendType = 'neutral'
           }
         }
-        
+
         dailyTask.value.chainRatioTrend = trendType
         dailyTask.value.chainRatio = displayValue + '%'
       }
@@ -266,7 +293,16 @@ const parseTaskData = (desc) => {
 // 调用API获取质控分析数据
 const fetchAnalysisData = async (queryParams) => {
   try {
-    const response = await getAnalysisReport(queryParams)
+    // 添加null检查，防止props.selectedDeptObject为null
+    const selectedDept = props.selectedDeptObject
+    const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
+
+    let rangParams = {
+      userId: deptType == 'USER' ? id : "",
+      deptId: ["STATION", "DEPARTMENT", "TEAMS", "BRIGADE"].includes(deptType) ? id : ""
+    }
+
+    const response = await getAnalysisReport({ ...queryParams, ...rangParams })
     console.log('质控分析数据:', response.data)
 
     // 解构赋值API返回的数据
@@ -332,7 +368,7 @@ watch(() => props.queryForm, (newQueryForm) => {
   if (newQueryForm.dateRangeQueryType && newQueryForm.year) {
     fetchAnalysisData(newQueryForm)
   }
-}, { deep: true, immediate: true })
+}, { deep: true })
 
 // 定义响应式数据
 const checkTask = ref({})

src/views/assistant/components/riskHazard.vue

@@ -138,6 +138,85 @@
             </el-table>
           </div>
         </div>
+
+        <!-- 第七个：移交公安数据 -->
+        <div class="panel-item">
+          <div class="panel-header">
+            <h3>移交公安数据</h3>
+          </div>
+
+          <!-- 描述卡片 -->
+          <div class="describe-card">
+            <div class="describe-content">
+              {{ policeTransferStats || '移交公安的违禁品数量共X件，主要集中于XX。' }}
+            </div>
+          </div>
+
+          <!-- 表格 -->
+          <div class="table-container">
+            <el-table :data="policeTransferData" size="small" height="250" :scroll="{ x: 'max-content' }">
+              <el-table-column prop="departmentName" label="科室" min-width="120" />
+              <el-table-column prop="teamName" label="班组" min-width="120" />
+              <el-table-column prop="userName" label="姓名" min-width="100" />
+              <el-table-column prop="itemName" label="查获物品" min-width="150" />
+              <el-table-column prop="quantity" label="查获数量" align="center" width="100" />
+              <el-table-column prop="positionName" label="查获部位" min-width="120" />
+              <el-table-column prop="seizureTime" label="查获时间" min-width="150" />
+              <el-table-column prop="channelName" label="查获通道" min-width="120" />
+            </el-table>
+          </div>
+        </div>
+
+        <!-- 第八个：X光机漏检数据 -->
+        <div class="panel-item" v-show="!isUserType">
+          <div class="panel-header">
+            <h3>X光机漏检数据</h3>
+          </div>
+
+          <!-- 描述卡片 -->
+          <div class="describe-card">
+            <div class="describe-content">
+              {{ xrayMissStats || 'X光机漏检事件主要集中于以下开机员：张三、李四、王五，可针对性开展判图技能强化培训。' }}
+            </div>
+          </div>
+
+          <!-- 表格 -->
+          <div class="table-container">
+            <el-table :data="xrayMissData" size="small" height="250" :scroll="{ x: 'max-content' }">
+              <el-table-column prop="departmentName" label="科室" min-width="120" />
+              <el-table-column prop="teamName" label="班组" min-width="120" />
+              <el-table-column prop="userName" label="姓名" min-width="100" />
+              <el-table-column prop="missItemName" label="漏检物品" min-width="150" />
+              <el-table-column prop="missQuantity" label="漏检数量" align="center" width="100" />
+              <el-table-column prop="missPosition" label="漏检部位" min-width="120" />
+              <el-table-column prop="channelName" label="漏检通道" min-width="120" />
+            </el-table>
+          </div>
+        </div>
+
+        <!-- 第九个：可能异常查获数据 -->
+        <div class="panel-item" v-show="!isTeamsType && !isUserType">
+          <div class="panel-header">
+            <h3>可能异常查获数据</h3>
+          </div>
+
+          <!-- 描述卡片 -->
+          <div class="describe-card" v-if="abnormalCaptureStats">
+            <div class="describe-content">
+              {{ abnormalCaptureStats || '旅检一科、旅检二科、旅检三科查获违禁品数量显著高于整体水平，旅检四科、旅检五科查获违禁品数量显著低于整体水平。' }}
+            </div>
+          </div>
+
+          <!-- 表格 -->
+          <div class="table-container">
+            <el-table :data="abnormalCaptureData" size="small" height="250" :scroll="{ x: 'max-content' }">
+              <el-table-column prop="departmentName" label="科室" min-width="120" />
+              <el-table-column prop="teamName" label="班组" min-width="120" />
+              <el-table-column prop="userName" label="姓名" min-width="100" />
+              <el-table-column prop="seizureQuantity" label="查获数量" align="center" width="100" />
+            </el-table>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -165,6 +244,10 @@ const props = defineProps({
       quarter: '',
       month: ''
     })
+  },
+  selectedDeptObject: {
+    type: Object,
+    default: null
   }
 })
 
@@ -187,154 +270,190 @@ const concealmentPositionStatsData = ref({})
 const departmentRankingData = ref({})
 const postCategoryStatsData = ref({})
 const channelRankingStatsData = ref({})
+// 计算属性：处理selectedDeptObject逻辑
+const selectedDeptType = computed(() => {
+  return props.selectedDeptObject && props.selectedDeptObject?.deptType
+})
+
+// 计算属性：检查是否为STATION类型
+const isStationType = computed(() => {
+  return selectedDeptType.value === 'STATION' || !selectedDeptType.value
+})
+// 计算属性：检查是否为STATION类型
+const isDepartmentType = computed(() => {
+  return selectedDeptType.value === 'DEPARTMENT'
+})
+
+const isBrigadeType = computed(() => {
+  return selectedDeptType.value === 'BRIGADE'
+})
+
+// 计算属性：检查是否为TEAMS类型
+const isTeamsType = computed(() => {
+  return selectedDeptType.value === 'TEAMS'
+})
+
+//
+const isUserType = computed(() => {
+  return selectedDeptType.value === 'USER'
+})
+// 新增三个API接口的响应式数据
+const policeTransferData = ref([])
+const xrayMissData = ref([])
+const abnormalCaptureData = ref([])
+
+// 新增三个统计API接口的响应式数据
+const policeTransferStats = ref('')
+const xrayMissStats = ref('')
+const abnormalCaptureStats = ref('')
 
 // 计算属性：动态生成查获违禁品类别描述
 const categoryStatsDescription = computed(() => {
-  
+
   if (!categoryStatsData.value || !categoryStatsData.value || !Array.isArray(categoryStatsData.value)) {
     return '查获物品以[占比最高物品类型]为主，占比达[X]%，其次为[第二高占比物品类型]（[X]%）、[第三高占比物品类型]（[X]%），需重点强化对应物品的安检识别与管控力度。'
   }
 
   const categoryData = categoryStatsData.value
-  
+
   // 1. 按数量排序，获取前三名
   const sortedData = [...categoryData].sort((a, b) => (b.quantity || 0) - (a.quantity || 0))
-  
+
   // 2. 计算总数量
   const totalCount = sortedData.reduce((sum, item) => sum + (item.quantity || 0), 0)
-  
+
   // 3. 获取前三名数据
   const top1 = sortedData[0] || { categoryNameOne: '未知类型', quantity: 0 }
   const top2 = sortedData[1] || { categoryNameOne: '未知类型', quantity: 0 }
   const top3 = sortedData[2] || { categoryNameOne: '未知类型', quantity: 0 }
-  
+
   // 4. 计算百分比
   const top1Percentage = totalCount > 0 ? ((top1.quantity / totalCount) * 100).toFixed(2) : '0.00'
   const top2Percentage = totalCount > 0 ? ((top2.quantity / totalCount) * 100).toFixed(2) : '0.00'
   const top3Percentage = totalCount > 0 ? ((top3.quantity / totalCount) * 100).toFixed(2) : '0.00'
-  
+
   // 5. 生成描述文字
-  return `查获物品以${top1.categoryNameOne  || '未知类型'}为主，占比达${top1Percentage}%，其次为${top2.categoryNameOne  || '未知类型'}（${top2Percentage}%）、${top3.categoryNameOne  || '未知类型'}（${top3Percentage}%），需重点强化对应物品的安检识别与管控力度。`
+  return `查获物品以${top1.categoryNameOne || '未知类型'}为主，占比达${top1Percentage}%，其次为${top2.categoryNameOne || '未知类型'}（${top2Percentage}%）、${top3.categoryNameOne || '未知类型'}（${top3Percentage}%），需重点强化对应物品的安检识别与管控力度。`
 })
 
 // 计算属性：动态生成查获时间趋势描述
-  const seizureTimeTrendDescription = computed(() => {
-    if (!seizureTimeTrendData.value || !seizureTimeTrendData.value || !Array.isArray(seizureTimeTrendData.value)) {
-      return '高峰时段：XX:XX、XX:XX左右（平均查获量达XX件），需强化对应时段的安检力度。低峰时段：XX:XX、XX:XX后（平均查获量XX件）'
-    }
+const seizureTimeTrendDescription = computed(() => {
+  if (!seizureTimeTrendData.value || !seizureTimeTrendData.value || !Array.isArray(seizureTimeTrendData.value)) {
+    return '高峰时段：XX:XX、XX:XX左右（平均查获量达XX件），需强化对应时段的安检力度。低峰时段：XX:XX、XX:XX后（平均查获量XX件）'
+  }
 
-    const trendData = seizureTimeTrendData.value
-    
-    // 1. 按查获量排序，找出最高和最低的两个时段
-    const sortedData = [...trendData].sort((a, b) => (b.total || 0) - (a.total || 0))
-    
-    // 2. 获取最高的两个时段
-    const peakHours = sortedData.slice(0, 2).map(item => item.hourOfDay || '').filter(Boolean)
-    
-    // 3. 获取最低的两个时段
-    const lowHours = sortedData.slice(-2).map(item => item.hourOfDay || '').filter(Boolean)
-    
-    // 4. 计算高峰时段平均查获量
-    const peakData = trendData.filter(item => peakHours.some(hour => item.hourOfDay?.includes(hour)))
-    const peakAvg = peakData.length > 0 
-      ? Math.round(peakData.reduce((sum, item) => sum + (item.total || 0), 0) / peakData.length)
-      : 0
-    
-    // 5. 计算低峰时段平均查获量
-    const lowData = trendData.filter(item => lowHours.some(hour => item.hourOfDay?.includes(hour)))
-    const lowAvg = lowData.length > 0 
-      ? Math.round(lowData.reduce((sum, item) => sum + (item.total || 0), 0) / lowData.length)
-      : 0
-    
-    // 6. 生成描述文字
-    return `高峰时段：${peakHours.join('、')}左右（平均查获量达${peakAvg}件），需强化对应时段的安检力度。低峰时段：${lowHours.join('、')}后（平均查获量${lowAvg}件）`
-  })
-
-  // 计算属性：动态生成隐匿物品查获部位描述
-  const concealmentPositionStatsDescription = computed(() => {
-    if (!concealmentPositionStatsData.value || !Array.isArray(concealmentPositionStatsData.value)) {
-      return '违禁品主要藏匿于"XX"，是安检搜检的重点部位。'
-    }
+  const trendData = seizureTimeTrendData.value
 
-    const positionData = concealmentPositionStatsData.value
-    
-    // 1. 按查获量排序，找出查获量最高的部位
-    const sortedData = [...positionData].sort((a, b) => (b.count || 0) - (a.count || 0))
-    
-    // 2. 获取查获量最高的部位
-    const topPosition = sortedData[0] || { positionName: 'XX', count: 0 }
-    
-    // 3. 生成描述文字
-    return `违禁品主要藏匿于"${topPosition.positionName || 'XX'}"，是安检搜检的重点部位。`
-  })
-
-  // 计算属性：动态生成大队查获排名描述
-  const departmentRankingDescription = computed(() => {
-    
-    if (!departmentRankingData.value || !Array.isArray(departmentRankingData.value)) {
-      return 'XXXX是违禁品查获的主力大队，查获违禁物品数量为XX，占比XX%。'
-    }
+  // 1. 按查获量排序，找出最高和最低的两个时段
+  const sortedData = [...trendData].sort((a, b) => (b.total || 0) - (a.total || 0))
 
-    const rankingData = departmentRankingData.value
-    
-    // 1. 按查获量排序，找出查获量最高的大队
-    const sortedData = [...rankingData].sort((a, b) => (b.seizureCount || 0) - (a.seizureCount || 0))
-    
-    // 2. 获取查获量最高的大队
-    const topDepartment = sortedData[0] || { departmentName: 'XXXX', seizureCount: 234 }
-    
-  
-    // 5. 生成描述文字
-    return `${topDepartment.brigadeName || 'XXXX'}是违禁品查获的主力大队，查获违禁物品数量为${topDepartment.seizureCount || 'XX'}，占比${topDepartment.currentRatio}%。`
-  })
-
-  // 计算属性：动态生成查获岗位分布描述
-  const postCategoryStatsDescription = computed(() => {
-    if (!postCategoryStatsData.value || !Array.isArray(postCategoryStatsData.value)) {
-      return '"XX"的查获数量最多，为XX件，占比XX%。'
-    }
+  // 2. 获取最高的两个时段
+  const peakHours = sortedData.slice(0, 2).map(item => item.hourOfDay || '').filter(Boolean)
 
-    const postData = postCategoryStatsData.value
-    
-    // 1. 按查获量排序，找出查获量最高的岗位
-    const sortedData = [...postData].sort((a, b) => (b.quantity || 0) - (a.quantity || 0))
-    
-    // 2. 获取查获量最高的岗位
-    const topPost = sortedData[0] || { postName: 'XX', quantity: 124 }
-    
-    // 3. 计算总查获量
-    const totalCount = postData.reduce((sum, item) => sum + (item.quantity || 0), 0)
-    
-    // 4. 计算占比
-    const percentage = totalCount > 0 ? ((topPost.quantity / totalCount) * 100).toFixed(0) : '45'
-    
-    // 5. 生成描述文字
-    return `"${topPost.postName || 'XX'}"的查获数量最多，为${topPost.quantity || 124}件，占比${percentage}%。`
-  })
-
-  // 计算属性：动态生成查获通道TOP5描述
-  const channelRankingStatsDescription = computed(() => {
-    if (!channelRankingStatsData.value || !Array.isArray(channelRankingStatsData.value)) {
-      return '违禁物品查获主要集中于XXXX，查获数量为XX，占比XX%。'
-    }
+  // 3. 获取最低的两个时段
+  const lowHours = sortedData.slice(-2).map(item => item.hourOfDay || '').filter(Boolean)
+
+  // 4. 计算高峰时段平均查获量
+  const peakData = trendData.filter(item => peakHours.some(hour => item.hourOfDay?.includes(hour)))
+  const peakAvg = peakData.length > 0
+    ? Math.round(peakData.reduce((sum, item) => sum + (item.total || 0), 0) / peakData.length)
+    : 0
+
+  // 5. 计算低峰时段平均查获量
+  const lowData = trendData.filter(item => lowHours.some(hour => item.hourOfDay?.includes(hour)))
+  const lowAvg = lowData.length > 0
+    ? Math.round(lowData.reduce((sum, item) => sum + (item.total || 0), 0) / lowData.length)
+    : 0
+
+  // 6. 生成描述文字
+  return `高峰时段：${peakHours.join('、')}左右（平均查获量达${peakAvg}件），需强化对应时段的安检力度。低峰时段：${lowHours.join('、')}后（平均查获量${lowAvg}件）`
+})
+
+// 计算属性：动态生成隐匿物品查获部位描述
+const concealmentPositionStatsDescription = computed(() => {
+  if (!concealmentPositionStatsData.value || !Array.isArray(concealmentPositionStatsData.value)) {
+    return '违禁品主要藏匿于"XX"，是安检搜检的重点部位。'
+  }
+
+  const positionData = concealmentPositionStatsData.value
+
+  // 1. 按查获量排序，找出查获量最高的部位
+  const sortedData = [...positionData].sort((a, b) => (b.count || 0) - (a.count || 0))
+
+  // 2. 获取查获量最高的部位
+  const topPosition = sortedData[0] || { positionName: 'XX', count: 0 }
+
+  // 3. 生成描述文字
+  return `违禁品主要藏匿于"${topPosition.positionName || 'XX'}"，是安检搜检的重点部位。`
+})
+
+// 计算属性：动态生成大队查获排名描述
+const departmentRankingDescription = computed(() => {
+
+  if (!departmentRankingData.value || !Array.isArray(departmentRankingData.value)) {
+    return 'XXXX是违禁品查获的主力大队，查获违禁物品数量为XX，占比XX%。'
+  }
+
+  const rankingData = departmentRankingData.value
+
+  // 1. 按查获量排序，找出查获量最高的大队
+  const sortedData = [...rankingData].sort((a, b) => (b.seizureCount || 0) - (a.seizureCount || 0))
+
+  // 2. 获取查获量最高的大队
+  const topDepartment = sortedData[0] || { departmentName: 'XXXX', seizureCount: 234 }
+
+  const str = isStationType.value ? '大队' : isBrigadeType.value ? '主管' : isDepartmentType.value ? '班组' : isTeamsType.value ? '成员' : ''
+  // 5. 生成描述文字
+  return `${topDepartment.brigadeName || 'XXXX'}是违禁品查获的主力${str}，查获违禁物品数量为${topDepartment.seizureCount || 'XX'}，占比${topDepartment.currentRatio}%。`
+})
+
+// 计算属性：动态生成查获岗位分布描述
+const postCategoryStatsDescription = computed(() => {
+  if (!postCategoryStatsData.value || !Array.isArray(postCategoryStatsData.value)) {
+    return '"XX"的查获数量最多，为XX件，占比XX%。'
+  }
+
+  const postData = postCategoryStatsData.value
+
+  // 1. 按查获量排序，找出查获量最高的岗位
+  const sortedData = [...postData].sort((a, b) => (b.quantity || 0) - (a.quantity || 0))
+
+  // 2. 获取查获量最高的岗位
+  const topPost = sortedData[0] || { postName: 'XX', quantity: 124 }
+
+  // 3. 计算总查获量
+  const totalCount = postData.reduce((sum, item) => sum + (item.quantity || 0), 0)
 
-    const channelData = channelRankingStatsData.value
-    
-    // 1. 按查获量排序，找出查获量最高的通道
-    const sortedData = [...channelData].sort((a, b) => (b.seizureQuantity || 0) - (a.seizureQuantity || 0))
-    
-    // 2. 获取查获量最高的通道
-    const topChannel = sortedData[0] || { channelName: 'XXXX', seizureQuantity: 123 }
-    
-    // 3. 计算总查获量
-    const totalCount = channelData.reduce((sum, item) => sum + (item.seizureQuantity || 0), 0)
-    
-    // 4. 计算占比
-    const percentage = totalCount > 0 ? ((topChannel.seizureQuantity / totalCount) * 100).toFixed(0) : '23'
-    
-    // 5. 生成描述文字
-    return `违禁物品查获主要集中于${topChannel.channelName || 'XXXX'}，查获数量为${topChannel.seizureQuantity || 'XX'}，占比${percentage}%。`
-  })
+  // 4. 计算占比
+  const percentage = totalCount > 0 ? ((topPost.quantity / totalCount) * 100).toFixed(0) : '45'
+
+  // 5. 生成描述文字
+  return `"${topPost.postName || 'XX'}"的查获数量最多，为${topPost.quantity || 124}件，占比${percentage}%。`
+})
+
+// 计算属性：动态生成查获通道TOP5描述
+const channelRankingStatsDescription = computed(() => {
+  if (!channelRankingStatsData.value || !Array.isArray(channelRankingStatsData.value)) {
+    return '违禁物品查获主要集中于XXXX，查获数量为XX，占比XX%。'
+  }
+
+  const channelData = channelRankingStatsData.value
+
+  // 1. 按查获量排序，找出查获量最高的通道
+  const sortedData = [...channelData].sort((a, b) => (b.seizureQuantity || 0) - (a.seizureQuantity || 0))
+
+  // 2. 获取查获量最高的通道
+  const topChannel = sortedData[0] || { channelName: 'XXXX', seizureQuantity: 123 }
+
+  // 3. 计算总查获量
+  const totalCount = channelData.reduce((sum, item) => sum + (item.seizureQuantity || 0), 0)
+
+  // 4. 计算占比
+  const percentage = totalCount > 0 ? ((topChannel.seizureQuantity / totalCount) * 100).toFixed(0) : '23'
+
+  // 5. 生成描述文字
+  return `违禁物品查获主要集中于${topChannel.channelName || 'XXXX'}，查获数量为${topChannel.seizureQuantity || 'XX'}，占比${percentage}%。`
+})
 
 // 表格数据
 const captureRankData = ref([])
@@ -357,36 +476,43 @@ 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)
+    const categoryStatsResponse = await getCategoryStats({ ...processedParams, ...otherParams })
     console.log('查获违禁品类别统计:', categoryStatsResponse)
     categoryStatsData.value = categoryStatsResponse.data?.categoryStats || []
 
     // 2. 查获时间趋势
-    const seizureTimeTrendResponse = await getSeizureTimeTrend(processedParams)
+    const seizureTimeTrendResponse = await getSeizureTimeTrend({ ...processedParams, ...otherParams })
     console.log('查获时间趋势:', seizureTimeTrendResponse)
     seizureTimeTrendData.value = seizureTimeTrendResponse?.data || []
 
     // 3. 隐匿物品查获部位统计
-    const concealmentPositionStatsResponse = await getConcealmentPositionStats(processedParams)
+    const concealmentPositionStatsResponse = await getConcealmentPositionStats({ ...processedParams, ...otherParams })
     console.log('隐匿物品查获部位统计:', concealmentPositionStatsResponse)
     concealmentPositionStatsData.value = concealmentPositionStatsResponse?.data?.positionStats || []
 
     // 4. 大队查获排名（表格数据）
-    const departmentRankingResponse = await getDepartmentRanking(processedParams)
+    const departmentRankingResponse = await getDepartmentRanking({ ...processedParams, ...otherParams })
     console.log('大队查获排名:', departmentRankingResponse)
     departmentRankingData.value = departmentRankingResponse.data || []
 
     // 5. 查获岗位分布统计
-    const postCategoryStatsResponse = await getPostCategoryStats(processedParams)
+    const postCategoryStatsResponse = await getPostCategoryStats({ ...processedParams, ...otherParams })
     console.log('查获岗位分布统计:', postCategoryStatsResponse)
     postCategoryStatsData.value = postCategoryStatsResponse?.data?.postStats || []
 
     // 6. 查获通道TOP5（表格数据）
-    const channelRankingStatsResponse = await getChannelRankingStats(processedParams)
+    const channelRankingStatsResponse = await getChannelRankingStats({ ...processedParams, ...otherParams })
     console.log('查获通道TOP5:', channelRankingStatsResponse)
     channelRankingStatsData.value = channelRankingStatsResponse?.data?.channelRankings || []
 
@@ -670,7 +796,7 @@ watch(() => props.queryForm, (newQueryForm) => {
   if (newQueryForm.dateRangeQueryType && newQueryForm.year) {
     fetchRiskHazardData(newQueryForm)
   }
-}, { deep: true, immediate: true })
+}, { deep: true })
 
 // 根据API数据更新图表和表格数据
 const updateChartsWithData = () => {
@@ -861,26 +987,27 @@ onUnmounted(() => {
 }
 
 .section-title h2 {
-  font-size: 24px;
+  margin: 0;
+  font-size: 18px;
   font-weight: 600;
   color: #333;
-  margin: 0;
 }
 
 /* 六个部分布局 */
 .six-panel-layout {
-  display: flex;
-  flex-direction: column;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
   gap: 16px;
+  grid-auto-flow: dense;
+  /* 自动填充空白区域 */
 }
 
 .panel-row {
-  display: flex;
-  gap: 16px;
+  display: contents;
+  /* 让子元素直接参与网格布局 */
 }
 
 .panel-item {
-  flex: 1;
   background: white;
   border-radius: 8px;
   padding: 20px;
@@ -888,6 +1015,10 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   gap: 16px;
+  min-width: 0;
+  /* 防止内容溢出 */
+  overflow: hidden;
+  /* 隐藏溢出内容 */
 }
 
 .panel-header {
@@ -958,7 +1089,28 @@ onUnmounted(() => {
   flex: 1;
   border: 1px solid #E4E7ED;
   border-radius: 4px;
+  max-height: 300px;
+  overflow: auto;
+  position: relative;
+}
+
+/* Element Plus表格横向滚动配置 */
+.table-container :deep(.el-table) {
+  width: 100%;
+  min-width: 100%;
+}
+
+.table-container :deep(.el-table .el-table__header-wrapper),
+.table-container :deep(.el-table .el-table__body-wrapper) {
+  overflow-x: auto !important;
+}
+
+.table-container :deep(.el-table__header) {
+  width: auto !important;
+}
 
+.table-container :deep(.el-table__body) {
+  width: auto !important;
 }
 
 /* 表格偶数行背景色 */