feat(performance/monthlyAssessSum): 新增大队维度的考核数据统计与图表展示

1.  新增获取部门列表接口，拉取大队数据并按大队维度拆分接口请求
2.  重构遍历数据逻辑，支持多大队的考核统计、待改进和不称职人数分布图表
3.  更新汇总表格标题，动态显示对应大队的统计信息
4.  优化职能部门的图表渲染逻辑，修复数据匹配问题
5.  调整样式代码格式，统一换行和缩进规范

src/views/performanceManage/monthlyAssessSum/index.vue

@@ -6,16 +6,16 @@
         <div class="filter-container">
           <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="search-form">
             <el-form-item label="考核月份" prop="assessmentMonth">
-              <el-date-picker v-model="queryParams.assessmentMonth" type="month" placeholder="请选择考核月份" 
+              <el-date-picker v-model="queryParams.assessmentMonth" type="month" placeholder="请选择考核月份"
                 value-format="YYYY-MM" style="width: 200px" />
             </el-form-item>
-            
+
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
-          
+
           <div class="export-button">
             <el-button type="warning" icon="Document" @click="handleExport">导出文档</el-button>
           </div>
@@ -26,7 +26,7 @@
     <!-- 非干部月度考核分数汇总 -->
     <div class="main-section">
       <h2 class="section-title">非干部月度考核分数汇总</h2>
-      
+
       <!-- 第一行：两个区块 -->
       <div class="chart-row">
         <!-- 整体分值分布柱状图 -->
@@ -34,7 +34,7 @@
           <div class="chart-header">整体分值分布柱状图</div>
           <div ref="overallBarChart" class="chart-container"></div>
         </el-card>
-        
+
         <!-- 参与人数占比饼图 -->
         <el-card class="chart-card">
           <div class="chart-header">参与人数占比饼图</div>
@@ -49,14 +49,15 @@
           <div class="chart-header">各部门分值分布对比图</div>
           <div ref="departmentComparisonChart" class="chart-container"></div>
         </el-card>
-        
+
         <!-- 汇总表 -->
         <el-card class="chart-card">
           <div class="chart-header">汇总表</div>
           <el-table :data="summaryTableData" border style="width: 100%; margin-top: 10px;">
             <el-table-column prop="rangeLabel" label="区间" align="center" min-width="100" />
             <el-table-column prop="totalCount" :label="summaryTableTitle" align="center" min-width="150" />
-            <el-table-column v-for="col in summaryTableColumns" :key="col.deptId" :prop="'team' + col.deptId" :label="col.deptName" align="center" min-width="100" />
+            <el-table-column v-for="col in summaryTableColumns" :key="col.deptId" :prop="'team' + col.deptId"
+              :label="col.deptName" align="center" min-width="100" />
           </el-table>
         </el-card>
       </div>
@@ -65,7 +66,7 @@
     <!-- 非干部月度考核分类结果汇总 -->
     <div class="main-section">
       <h2 class="section-title">非干部月度考核分类结果汇总</h2>
-      
+
       <!-- 汇总统计表格 -->
       <el-card class="summary-table-card">
         <div class="chart-header">汇总统计</div>
@@ -91,7 +92,7 @@
             <div ref="brigadePieChart2" class="pie-chart"></div>
           </div>
         </el-card>
-        
+
         <!-- 岗位分布统计图 -->
         <el-card class="chart-card">
           <div class="chart-header">岗位分布统计图</div>
@@ -122,15 +123,15 @@
               <el-table-column prop="actualIncompetentCount" label="实际不称职人数" align="center" min-width="140" />
             </el-table>
           </div>
-          
+
           <!-- 右边两个饼状图 -->
           <div class="chart-section">
             <div class="pie-chart-container">
-              <div class="pie-chart-title">考核结果分布</div>
+              <div class="pie-chart-title">{{ item.title }}实际待改进人数分布</div>
               <div :ref="el => setTraversalChartRef(el, `pieChart1_${index}`)" class="pie-chart"></div>
             </div>
             <div class="pie-chart-container">
-              <div class="pie-chart-title">改进情况分布</div>
+              <div class="pie-chart-title">{{ item.title }}实际不称职人数分布</div>
               <div :ref="el => setTraversalChartRef(el, `pieChart2_${index}`)" class="pie-chart"></div>
             </div>
           </div>
@@ -158,7 +159,7 @@
               <el-table-column prop="actualUnqualified" label="实际不称职人数" align="center" min-width="140" />
             </el-table>
           </div>
-          
+
           <!-- 右边柱状图和饼状图 -->
           <div class="chart-section">
             <div class="bar-chart-container">
@@ -198,6 +199,7 @@ import {
   getFunctionalDeptPersonnelDistribution,
   getFunctionalDeptDistributionPie
 } from '@/api/performance/monthlyAssessSum.js'
+import { listDept } from '@/api/system/dept.js'
 
 // 响应式数据
 const loading = ref(false)
@@ -240,11 +242,11 @@ const classificationTableData = ref([
 
 // 遍历数据
 const traversalData1 = ref([
-  
+
 ])
 
 const traversalData2 = ref([
-  
+
 ])
 
 // 图表实例
@@ -478,6 +480,11 @@ const handleResize = () => {
 const getList = async () => {
   loading.value = true
   try {
+    // 获取大队列表
+    const brigadeListRes = await listDept()
+    const brigadeList = (brigadeListRes.data || []).filter(item => item.deptType === 'BRIGADE' && item.isFunctionalDept == 0)
+
+    // 其他接口调用
     const results = await Promise.allSettled([
       getScoreDistribution(queryParams),
       getDeptParticipation(queryParams),
@@ -487,15 +494,50 @@ const getList = async () => {
       getActualIncompetentDistribution(queryParams),
       getAssessmentTeamImprovementDistribution(queryParams),
       getAssessmentTeamIncompetentDistribution(queryParams),
-      getDeptAssessmentTeamStatistics(queryParams),
-      getBrigadeImprovementDistribution(queryParams),
-      getBrigadeIncompetentDistribution(queryParams),
       getFunctionalDeptSummary(queryParams),
       getFunctionalDeptPersonnelDistribution(queryParams),
       getFunctionalDeptDistributionPie(queryParams)
     ])
 
-    const [scoreDistRes, deptPartRes, deptScoreRes, assessmentSumRes, actualImproveRes, actualIncompRes, teamImproveRes, teamIncompRes, deptTeamStatRes, brigadeImproveRes, brigadeIncompRes, functionalDeptRes, functionalDeptPersonnelRes, functionalDeptPieRes] = results
+    const [scoreDistRes, deptPartRes, deptScoreRes, assessmentSumRes, actualImproveRes, actualIncompRes, teamImproveRes, teamIncompRes, functionalDeptRes, functionalDeptPersonnelRes, functionalDeptPieRes] = results
+
+    // 对每个大队调用三个接口
+    const brigadeDataPromises = brigadeList.map(async (brigade) => {
+      const brigadeParams = { ...queryParams, deptId: brigade.deptId }
+      const brigadeResults = await Promise.allSettled([
+        getDeptAssessmentTeamStatistics(brigadeParams),
+        getBrigadeImprovementDistribution(brigadeParams),
+        getBrigadeIncompetentDistribution(brigadeParams)
+      ])
+      
+      const [deptTeamStatRes, brigadeImproveRes, brigadeIncompRes] = brigadeResults
+      
+      const statisticsData = deptTeamStatRes.status === 'fulfilled' ? (deptTeamStatRes.value.data || []) : []
+      const brigadeImproveData = brigadeImproveRes.status === 'fulfilled' ? (brigadeImproveRes.value.data || []) : []
+      const brigadeIncompData = brigadeIncompRes.status === 'fulfilled' ? (brigadeIncompRes.value.data || []) : []
+      
+      // 解析表格数据
+      let tableData = []
+      if (statisticsData.length > 0 && statisticsData[0].assessmentTeams) {
+        tableData = statisticsData[0].assessmentTeams
+      }
+      
+      // 计算总计用于标题
+      const totalImprovement = tableData.reduce((sum, item) => sum + (item.actualImprovementCount || 0), 0)
+      const totalIncompetent = tableData.reduce((sum, item) => sum + (item.actualIncompetentCount || 0), 0)
+      
+      return {
+        title: brigade.deptName,
+        deptId: brigade.deptId,
+        tableData,
+        improveData: brigadeImproveData,
+        incompData: brigadeIncompData,
+        totalImprovement,
+        totalIncompetent
+      }
+    })
+
+    traversalData1.value = await Promise.all(brigadeDataPromises)
 
     if (scoreDistRes.status === 'fulfilled' && scoreDistRes.value.data) {
       const data = scoreDistRes.value.data
@@ -521,7 +563,7 @@ const getList = async () => {
       if (departmentComparisonChartInstance && Array.isArray(data)) {
         const xAxisData = data.map(item => item.rangeLabel)
         const firstDeptCounts = data.length > 0 ? data[0].deptCounts : []
-        
+
         const series = firstDeptCounts.map(dept => ({
           name: dept.deptName,
           type: 'bar',
@@ -594,85 +636,82 @@ const getList = async () => {
       }
     }
 
-    if (deptTeamStatRes.status === 'fulfilled' && deptTeamStatRes.value.data) {
-      const statistics = deptTeamStatRes.value.data || []
-      const brigadeImproveData = brigadeImproveRes.status === 'fulfilled' ? (brigadeImproveRes.value.data || []) : []
-      const brigadeIncompData = brigadeIncompRes.status === 'fulfilled' ? (brigadeIncompRes.value.data || []) : []
-      
-      const brigadeMap = {}
-      brigadeImproveData.forEach(item => {
-        if (!brigadeMap[item.deptName]) {
-          brigadeMap[item.deptName] = { brigade: item.deptName, assessmentGroup: '', improvementCount: 0, exemption1: 0, unqualifiedCount: 0, exemption2: 0 }
+    // 初始化traversalData1对应的图表
+    nextTick(() => {
+      traversalData1.value.forEach((item, index) => {
+        const chartKey1 = `pieChart1_${index}`
+        const chartKey2 = `pieChart2_${index}`
+
+        if (traversalChartsRefs.value[chartKey1] && item.improveData) {
+          const pieChart1 = echarts.init(traversalChartsRefs.value[chartKey1])
+          pieChart1.setOption({
+            tooltip: { trigger: 'item' },
+            series: [{
+              type: 'pie',
+              radius: '70%',
+              data: item.improveData.map(d => ({ name: d.assessmentTeam, value: d.count }))
+            }]
+          })
         }
-        brigadeMap[item.deptName].improvementCount += item.count
-        brigadeMap[item.deptName].exemption1 += (item.exemptedCount || 0)
-      })
-      brigadeIncompData.forEach(item => {
-        if (!brigadeMap[item.deptName]) {
-          brigadeMap[item.deptName] = { brigade: item.deptName, assessmentGroup: '', improvementCount: 0, exemption1: 0, unqualifiedCount: 0, exemption2: 0 }
+
+        if (traversalChartsRefs.value[chartKey2] && item.incompData) {
+          const pieChart2 = echarts.init(traversalChartsRefs.value[chartKey2])
+          pieChart2.setOption({
+            tooltip: { trigger: 'item' },
+            series: [{
+              type: 'pie',
+              radius: '70%',
+              data: item.incompData.map(d => ({ name: d.assessmentTeam, value: d.count }))
+            }]
+          })
         }
-        brigadeMap[item.deptName].unqualifiedCount += item.count
-        brigadeMap[item.deptName].exemption2 += (item.exemptedCount || 0)
       })
-      
-      const groupCount = statistics.reduce((sum, item) => sum + (item.count || 0), 0)
-      const calculatedImprovement = statistics.reduce((sum, item) => sum + (item.calculatedImprovementCount || 0), 0)
-      const actualImprovement = statistics.reduce((sum, item) => sum + (item.actualImprovementCount || 0), 0)
-      const actualUnqualified = statistics.reduce((sum, item) => sum + (item.actualIncompetentCount || 0), 0)
-      
-      const tableData = Object.values(brigadeMap).map(item => ({
-        ...item,
-        groupCount,
-        calculatedImprovement,
-        actualImprovement,
-        actualUnqualified
-      }))
-      
-      if (tableData.length > 0) {
-        traversalData1.value = [{ title: '大队考核统计', tableData }]
-      }
-    }
+    })
 
     if (functionalDeptRes.status === 'fulfilled' && functionalDeptRes.value.data) {
       const summaryData = functionalDeptRes.value.data || []
-      
-      traversalData2.value = summaryData.map(item => ({
-        title: item.deptName,
-        deptId: item.deptId,
-        tableData: item.assessmentTeams || []
-      }))
-      
       const personnelData = functionalDeptPersonnelRes.status === 'fulfilled' ? (functionalDeptPersonnelRes.value.data || []) : []
       const pieData = functionalDeptPieRes.status === 'fulfilled' ? (functionalDeptPieRes.value.data || []) : []
-      
-      personnelData.forEach(item => {
-        const deptItem = traversalData2.value.find(d => d.deptId === item.deptId)
-        if (deptItem) {
-          deptItem.personnelCount = item.assessmentTeamCount || 0
-          deptItem.actualImprovement = item.actualImprovementCount || 0
-          deptItem.actualUnqualified = item.actualIncompetentCount || 0
+
+      traversalData2.value = summaryData.map(item => {
+        // 匹配人员数据
+        const personnelItem = personnelData.find(p => p.deptId === item.deptId)
+        // 匹配饼图数据
+        const deptPieData = pieData.filter(p => p.deptId === item.deptId)
+
+        return {
+          title: item.deptName,
+          deptId: item.deptId,
+          tableData: item.assessmentTeams || [],
+          barData: personnelItem ? [
+            { name: '考核组人数', value: personnelItem.assessmentTeamCount || 0 },
+            { name: '实际待改进人数', value: personnelItem.actualImprovementCount || 0 },
+            { name: '实际不称职人数', value: personnelItem.actualIncompetentCount || 0 }
+          ] : [],
+          pieData: deptPieData.map(p => ({ name: p.assessmentTeam, value: p.count }))
         }
       })
-      
+
       nextTick(() => {
-        pieData.forEach(pieItem => {
-          const deptIndex = traversalData2.value.findIndex(d => d.deptId === pieItem.deptId)
-          const chartKey = `barChart_${deptIndex}`
-          const pieChartKey = `pieChart3_${deptIndex}`
-          
-          const filteredData = pieData.filter(p => p.deptId === pieItem.deptId).map(p => ({ name: p.assessmentTeam, value: p.count }))
-          
-          if (traversalChartsRefs.value[chartKey]) {
+        traversalData2.value.forEach((item, index) => {
+          const chartKey = `barChart_${index}`
+          const pieChartKey = `pieChart3_${index}`
+
+          if (traversalChartsRefs.value[chartKey] && item.barData.length > 0) {
             const barChart = echarts.init(traversalChartsRefs.value[chartKey])
             barChart.setOption({
-              series: [{ data: filteredData }]
+              tooltip: { trigger: 'axis' },
+              xAxis: { type: 'category', data: item.barData.map(d => d.name) },
+              yAxis: { type: 'value' },
+              series: [{ type: 'bar', data: item.barData.map(d => d.value), itemStyle: { color: '#3b82f6' } }]
             })
           }
-          
-          if (traversalChartsRefs.value[pieChartKey]) {
+
+          if (traversalChartsRefs.value[pieChartKey] && item.pieData.length > 0) {
             const pieChart = echarts.init(traversalChartsRefs.value[pieChartKey])
             pieChart.setOption({
-              series: [{ data: filteredData }]
+              tooltip: { trigger: 'item' },
+              series: [{ type: 'pie', radius: '70%', data: item.pieData }]
             })
           }
         })
@@ -857,7 +896,8 @@ onUnmounted(() => {
   height: 400px;
 }
 
-.pie-chart-container, .bar-chart-container {
+.pie-chart-container,
+.bar-chart-container {
   display: flex;
   flex-direction: column;
   border: 1px solid #e4e7ed;
@@ -866,7 +906,8 @@ onUnmounted(() => {
   background-color: #fff;
 }
 
-.pie-chart-title, .chart-title {
+.pie-chart-title,
+.chart-title {
   font-size: 14px;
   font-weight: 600;
   color: #606266;
@@ -874,7 +915,8 @@ onUnmounted(() => {
   text-align: center;
 }
 
-.pie-chart, .bar-chart {
+.pie-chart,
+.bar-chart {
   flex: 1;
   min-height: 300px;
 }
@@ -884,22 +926,23 @@ onUnmounted(() => {
   .chart-row {
     grid-template-columns: 1fr;
   }
-  
+
   .pie-charts-container {
     grid-template-columns: 1fr;
   }
-  
+
   .traversal-content {
     grid-template-columns: 1fr;
     gap: 15px;
   }
-  
+
   .chart-section {
     grid-template-columns: 1fr;
     height: auto;
   }
-  
-  .pie-chart, .bar-chart {
+
+  .pie-chart,
+  .bar-chart {
     min-height: 250px;
   }
 }
@@ -908,12 +951,13 @@ onUnmounted(() => {
   .traversal-content {
     padding: 15px;
   }
-  
+
   .chart-section {
     gap: 10px;
   }
-  
-  .pie-chart-container, .bar-chart-container {
+
+  .pie-chart-container,
+  .bar-chart-container {
     padding: 8px;
   }
 }