perf,feat: 完成人事绩效模块多页面功能迭代与接口优化

1.  新增部门职能部门筛选表单项与绩效用户列表接口
2.  重构月度考核API参数传递方式，新增非干部考核详情与自动生成接口
3.  重写绩效汇总页面API与表格图表逻辑，适配新后端接口
4.  优化非干部月度考核页面表单与交互逻辑，修复ID绑定问题

src/api/performance/monthlyAssess.js

@@ -10,11 +10,11 @@ export function listCadreAssessment(query) {
 }
 
 // 生成本月考核数据
-export function generateCadreAssessment(params) {
+export function generateCadreAssessment(data) {
   return request({
     url: '/personnel/cadre-assessment/generate',
     method: 'post',
-    params: params
+    data: data
   })
 }
 
@@ -27,19 +27,19 @@ export function listNonCadreAssessment(query) {
   })
 }
 //新增非干部月度考核
-export function addNonCadreAssessment(params) {
+export function addNonCadreAssessment(data) {
   return request({
     url: '/personnel/assessment',
     method: 'post',
-    params: params
+    data: data
   })
 }
 //修改非干部月度考核
-export function updateNonCadreAssessment(params) {
+export function updateNonCadreAssessment(data) {
   return request({
     url: '/personnel/assessment',
     method: 'put',
-    params: params
+    data: data
   })
 }
 //删除非干部月度考核
@@ -50,10 +50,25 @@ export function deleteNonCadreAssessment(ids) {
   })
 }
 //导出非干部月度考核列表
-export function exportNonCadreAssessment(params) {
+export function exportNonCadreAssessment(data) {
   return request({
     url: '/personnel/assessment/export',
     method: 'post',
-    params: params
+    data: data
+  })
+}
+//获取非干部月度考核详细信息
+export function getNonCadreAssessment(id) {
+  return request({
+    url: `/personnel/assessment/${id}`,
+    method: 'get'
+  })
+}
+
+//自动生成指定月份非干部月度考核数据
+export function generateNonCadreAssessment(query) {
+  return request({
+    url: `/personnel/assessment/autoGenerate/${query.month}`,
+    method: 'get',
   })
 }

src/api/performance/monthlyAssessSum.js

@@ -1,20 +1,113 @@
 import request from '@/utils/request'
 
-// 获取非干部月度考核汇总数据
-export function getNonCadreMonthlyAssessSummary(query) {
+export function getScoreDistribution(query) {
   return request({
-    url: '/performance/non-cadre-monthly-assess-summary',
+    url: '/personnel/non-cadre-assessment/score-summary/score-distribution',
     method: 'get',
     params: query
   })
 }
 
-// 导出非干部月度考核汇总数据
-export function exportNonCadreMonthlyAssessSummary(query) {
+export function getDeptParticipation(query) {
   return request({
-    url: '/performance/non-cadre-monthly-assess-summary/export',
+    url: '/personnel/non-cadre-assessment/score-summary/dept-participation',
     method: 'get',
-    params: query,
-    responseType: 'blob'
+    params: query
+  })
+}
+
+export function getDeptScoreDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-score-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentSummary(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-summary',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getActualImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/actual-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getActualIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/actual-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentTeamImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-team-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentTeamIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-team-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDeptAssessmentTeamStatistics(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-assessment-team-statistics',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getBrigadeImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/brigade-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getBrigadeIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/brigade-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptSummary(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-summary',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptPersonnelDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-personnel-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptDistributionPie(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-distribution-pie',
+    method: 'get',
+    params: query
   })
 }

src/api/system/user.js

@@ -158,4 +158,12 @@ export function selectUserLeaderListByCondition(data) {
     method: 'post',
     data: data
   })
+}
+//查询人事绩效用户列表
+export function listUserPerformance(data) {
+  return request({
+    url: '/system/user/selectPersonnelUserList',
+    method: 'post',
+    data: data
+  })
 }

src/views/performanceManage/monthlyAssess/index.vue

@@ -170,22 +170,23 @@
 
 
     <!-- 编辑/新增弹窗 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" :close-on-click-modal="false">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" :close-on-click-modal="false"
+      destroy-on-close>
       <!-- 非干部表单 -->
       <el-form v-if="dialog.type === 'non-cadre'" :model="nonCadreForm" ref="formRef" :rules="nonCadreRules"
-        label-width="180px" class="form-container">
+        label-width="380px" class="form-container">
         <!-- 第一部分：基础信息 -->
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="姓名" prop="userName">
-              <el-select v-model="nonCadreForm.userName" placeholder="请选择姓名" style="width: 100%" clearable filterable
+            <el-form-item label="姓名" prop="userId" label-width="100px">
+              <el-select v-model="nonCadreForm.userId" placeholder="请选择姓名" style="width: 100%" clearable filterable
                 @change="handleUserChange">
-                <el-option v-for="user in userList" :key="user.userId" :label="user.userName" :value="user.userName" />
+                <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="考核月份" prop="assessmentMonth">
+            <el-form-item label="考核月份" prop="assessmentMonth" label-width="100px">
               <el-date-picker v-model="nonCadreForm.assessmentMonth" type="month" placeholder="请选择考核月份"
                 value-format="YYYY-MM" style="width: 100%" />
             </el-form-item>
@@ -201,23 +202,22 @@
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="用工形式" prop="employmentType">
+            <el-form-item label="用工形式" prop="employmentType" label-width="100px">
               <el-select v-model="nonCadreForm.employmentType" placeholder="请选择用工形式" style="width: 100%" disabled>
                 <el-option v-for="item in employment_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="角色" prop="roleName">
+            <el-form-item label="角色" prop="roleName" label-width="100px">
               <el-input v-model="nonCadreForm.roleName" disabled placeholder="角色" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分管班组长" prop="deputyTeamLeaderName">
-              <el-select v-model="nonCadreForm.deputyTeamLeaderName" placeholder="请选择分管班组长" style="width: 100%"
-                clearable>
-                <el-option v-for="leader in teamLeaderOptions" :key="leader.userId" :label="leader.userName"
-                  :value="leader.userName" />
+            <el-form-item label="分管班组长" prop="deputyTeamLeaderId" label-width="100px">
+              <el-select v-model="nonCadreForm.deputyTeamLeaderId" placeholder="请选择分管班组长" style="width: 100%" clearable>
+                <el-option v-for="leader in teamLeaderOptions" :key="leader.userId" :label="leader.nickName"
+                  :value="leader.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -227,28 +227,30 @@
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="分管主管" prop="deputySupervisorName">
-              <el-select v-model="nonCadreForm.deputySupervisorName" placeholder="请选择分管主管" style="width: 100%"
-                clearable>
-                <el-option v-for="supervisor in supervisorOptions" :key="supervisor.userId" :label="supervisor.userName"
-                  :value="supervisor.userName" />
+            <el-form-item label="分管主管" prop="deputySupervisorId" label-width="100px">
+              <el-select v-model="nonCadreForm.deputySupervisorId" placeholder="请选择分管主管" style="width: 100%" clearable>
+                <el-option v-for="supervisor in supervisorOptions" :key="supervisor.userId" :label="supervisor.nickName"
+                  :value="supervisor.userId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分管经理" prop="deputyManagerName">
-              <el-input v-model="nonCadreForm.deputyManagerName" placeholder="请输入分管经理" />
+            <el-form-item label="分管经理" prop="deputyManagerId" label-width="100px">
+              <el-select v-model="nonCadreForm.deputyManagerId" placeholder="请选择分管经理" style="width: 100%" clearable>
+                <el-option v-for="manager in managerOptions" :key="manager.userId" :label="manager.nickName"
+                  :value="manager.userId" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="考核组" prop="assessmentTeam">
+            <el-form-item label="考核组" prop="assessmentTeam" label-width="100px">
               <el-select v-model="nonCadreForm.assessmentTeam" placeholder="请选择考核组" style="width: 100%">
                 <el-option v-for="item in assessment_team" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="岗位" prop="post">
+            <el-form-item label="岗位" prop="post" label-width="100px">
               <el-select v-model="nonCadreForm.post" placeholder="请选择岗位" style="width: 100%">
                 <el-option v-for="item in post" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -262,11 +264,11 @@
           <div v-for="(group, groupIndex) in nonCadreForm.indicatorGroups" :key="groupIndex" class="indicator-group">
             <div class="indicator-group-title">{{ group.title }}</div>
             <div v-for="(item, itemIndex) in group.items" :key="itemIndex" class="indicator-item">
-              <div class="indicator-name">{{ item.name }}</div>
+              <div class="indicator-name">{{ item.indicatorName }}</div>
               <div class="indicator-value">{{ item.score }}/次</div>
-              <div class="indicator-count">{{ item.count }}次</div>
-              <div class="indicator-source">{{ item.source }}</div>
-              <div class="indicator-total">{{ item.total }}</div>
+              <div class="indicator-count">{{ item.occurCount }}次</div>
+              <div class="indicator-qcDeptType">{{ item.qcDeptType }}</div>
+              <div class="indicator-total">{{ item.scoreResult }}</div>
               <div class="indicator-actions">
                 <el-button type="primary" link icon="Edit" @click="editIndicator(groupIndex, itemIndex)"></el-button>
                 <el-button type="danger" link icon="Delete" @click="deleteIndicator(groupIndex, itemIndex)"></el-button>
@@ -286,8 +288,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="红线指标依据">
-                <span class="detail-link" @click="showDetailModal('红线指标依据', nonCadreForm.redLineBasis)">
-                  {{ nonCadreForm.redLineBasis || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('红线指标依据', formatAccordList(nonCadreForm.redLineIndexAccordList))">
+                  {{ formatAccordList(nonCadreForm.redLineIndexAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -301,8 +304,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="核心指标依据">
-                <span class="detail-link" @click="showDetailModal('核心指标依据', nonCadreForm.coreIndicatorBasis)">
-                  {{ nonCadreForm.coreIndicatorBasis || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('核心指标依据', formatAccordList(nonCadreForm.coreIndexAccordList))">
+                  {{ formatAccordList(nonCadreForm.coreIndexAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -316,8 +320,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="其他指标中的安全指标（仅含SOC/站品控检查扣分）依据">
-                <span class="detail-link" @click="showDetailModal('其他指标中的安全指标依据', nonCadreForm.safetyWithSocBasis)">
-                  {{ nonCadreForm.safetyWithSocBasis || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('其他指标中的安全指标依据', formatAccordList(nonCadreForm.otherIndexSafetyScoreWithSocStationQcAccordList))">
+                  {{ formatAccordList(nonCadreForm.otherIndexSafetyScoreWithSocStationQcAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -331,8 +336,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="其他指标中的非安全指标依据">
-                <span class="detail-link" @click="showDetailModal('其他指标中的非安全指标依据', nonCadreForm.nonSafetyIndicatorBasis)">
-                  {{ nonCadreForm.nonSafetyIndicatorBasis || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('其他指标中的非安全指标依据', formatAccordList(nonCadreForm.otherIndexNonSafetyAccordList))">
+                  {{ formatAccordList(nonCadreForm.otherIndexNonSafetyAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -346,8 +352,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="SOC/站品控检查的涉及核心、安全指标扣分依据">
-                <span class="detail-link" @click="showDetailModal('SOC/站品控检查的涉及核心、安全指标扣分依据', nonCadreForm.socSafetyCoreDeductionBasis)">
-                  {{ nonCadreForm.socSafetyCoreDeductionBasis || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('SOC/站品控检查的涉及核心、安全指标扣分依据', formatAccordList(nonCadreForm.socStationQcInvolvedCoreSafetyAccordList))">
+                  {{ formatAccordList(nonCadreForm.socStationQcInvolvedCoreSafetyAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -382,15 +389,17 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="奖励明细">
-                <span class="detail-link" @click="showDetailModal('奖励明细', nonCadreForm.rewardDetailsSummary)">
-                  {{ nonCadreForm.rewardDetailsSummary || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('奖励明细', formatAccordList(nonCadreForm.rewardAccordList))">
+                  {{ formatAccordList(nonCadreForm.rewardAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="惩罚明细">
-                <span class="detail-link" @click="showDetailModal('惩罚明细', nonCadreForm.penaltyDetailsSummary)">
-                  {{ nonCadreForm.penaltyDetailsSummary || '查看详情' }}
+                <span class="detail-link"
+                  @click="showDetailModal('惩罚明细', formatAccordList(nonCadreForm.punishmentAccordList))">
+                  {{ formatAccordList(nonCadreForm.punishmentAccordList) || '查看详情' }}
                 </span>
               </el-form-item>
             </el-col>
@@ -473,13 +482,13 @@
     <!-- 第二个模态框：添加/编辑扣分指标 -->
     <el-dialog :title="indicatorDialog.title" v-model="indicatorDialog.visible" width="60%">
       <el-form label-width="150px" class="indicator-form">
-        <el-form-item label="指标名称">
+        <el-form-item label="指标名称" prop="indicatorId">
           <div style="display: flex; align-items: center; gap: 10px; width: 100%;">
-            <el-select v-model="indicatorDialog.form.name" placeholder="搜索指标名称" filterable remote reserve-keyword
+            <el-select v-model="indicatorDialog.form.indicatorId" placeholder="搜索指标名称" filterable remote reserve-keyword
               :remote-method="searchIndicators" :loading="indicatorDialog.loading" style="flex: 1;"
               @change="onIndicatorNameChange">
               <el-option v-for="item in indicatorDialog.indicatorOptions" :key="item.id" :label="item.name"
-                :value="item.name" />
+                :value="item.id" />
             </el-select>
           </div>
         </el-form-item>
@@ -493,14 +502,14 @@
 
         <el-form-item label="发生次数">
           <div style="display: flex; align-items: center; gap: 10px;">
-            <el-input-number v-model="indicatorDialog.form.count" :min="1" style="width: 200px;"
+            <el-input-number v-model="indicatorDialog.form.occurCount" :min="1" style="width: 200px;"
               @change="updateTotal" />
 
           </div>
         </el-form-item>
 
         <el-form-item label="检查部门">
-          <el-select v-model="indicatorDialog.form.source" placeholder="请选择" style="width: 200px;">
+          <el-select v-model="indicatorDialog.form.qcDeptType" placeholder="请选择" style="width: 200px;">
             <el-option v-for="item in base_performance_indicator_qc_dept_type" :key="item.value" :label="item.label"
               :value="item.value" />
           </el-select>
@@ -540,7 +549,7 @@
     <!-- 详情模态框 -->
     <el-dialog :title="detailModal.title" v-model="detailModal.visible" width="60%">
       <div class="detail-content">
-        {{ detailModal.content || '暂无内容' }}
+        {{ detailModal?.content || '暂无内容' }}
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -556,8 +565,8 @@ import { ref, reactive, onMounted, getCurrentInstance, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 // API导入（需要根据实际API路径调整）
-import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment } from '@/api/performance/monthlyAssess.js'
-import { selectUserLeaderListByCondition, listAllUser } from '@/api/system/user.js'
+import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment, generateNonCadreAssessment, getNonCadreAssessment } from '@/api/performance/monthlyAssess.js'
+import { selectUserLeaderListByCondition, listUserPerformance } from '@/api/system/user.js'
 import { listIndicator } from '@/api/system/classificationAssess.js'
 
 const { proxy } = getCurrentInstance()
@@ -575,6 +584,8 @@ watch(() => currentTab.value, () => {
   getList()
 })
 
+
+
 // 查询参数
 const queryParams = reactive({
   pageNum: 1,
@@ -583,18 +594,24 @@ const queryParams = reactive({
   assessmentMonth: ''
 })
 
-// 非干部表单数据
-const nonCadreForm = reactive({
+const currentMonthDefault = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`
+
+const getEmptyNonCadreForm = () => ({
+  id: '',
   userId: '',
   userName: '',
+  roleKey: '',
+  roleId: '',
+  roleName: '',
   employmentType: '',
   post: '',
-  assessmentMonth: '',
+  assessmentMonth: currentMonthDefault,
   assessmentTeam: '',
   deputyTeamLeaderId: '',
   deputyTeamLeaderName: '',
   deputySupervisorId: '',
   deputySupervisorName: '',
+  deputyManagerId: '',
   deputyManagerName: '',
   inChargeEmployeeCount: 0,
   totalScore: 0,
@@ -607,14 +624,64 @@ const nonCadreForm = reactive({
   punishmentAmount: 0,
   assessmentRemark: '',
   applicationMethodRemark: '',
-  indicatorGroups: []
+  indicatorGroups: [],
+  redLineTriggerCount: '',
+  coreIndicatorScore: '',
+  safetyWithSocScore: '',
+  nonSafetyIndicatorScore: '',
+  socSafetyCoreDeduction: '',
+  nonCoreSafetyCoreDeduction: '',
+  averageDeduction: '',
+  rewardDetailsSummary: '',
+  penaltyDetailsSummary: '',
+  redLineIndexAccordList: [],
+  coreIndexAccordList: [],
+  otherIndexSafetyScoreWithSocStationQcAccordList: [],
+  otherIndexNonSafetyAccordList: [],
+  socStationQcInvolvedCoreSafetyAccordList: [],
+  rewardAccordList: [],
+  punishmentAccordList: []
 })
 
+const nonCadreForm = reactive(getEmptyNonCadreForm())
+
+watch(() => nonCadreForm.assessmentMonth, (newVal) => {
+  if (newVal) {
+    const month = newVal.replace('-', '')
+    loadUserList(month)
+  }
+})
+
+watch(() => nonCadreForm.deputyTeamLeaderId, (newVal) => {
+  if (newVal) {
+    const leader = teamLeaderOptions.value.find(u => u.userId === newVal)
+    nonCadreForm.deputyTeamLeaderName = leader?.nickName || ''
+  } else {
+    nonCadreForm.deputyTeamLeaderName = ''
+  }
+})
+
+watch(() => nonCadreForm.deputySupervisorId, (newVal) => {
+  if (newVal) {
+    const supervisor = supervisorOptions.value.find(u => u.userId === newVal)
+    nonCadreForm.deputySupervisorName = supervisor?.nickName || ''
+  } else {
+    nonCadreForm.deputySupervisorName = ''
+  }
+})
+
+watch(() => nonCadreForm.deputyManagerId, (newVal) => {
+  if (newVal) {
+    const manager = managerOptions.value.find(u => u.userId === newVal)
+    nonCadreForm.deputyManagerName = manager?.nickName || ''
+  } else {
+    nonCadreForm.deputyManagerName = ''
+  }
+})
 
 
 function addIndicatorToGroup(item) {
   const categoryName = item.categoryNameOne || '未分类'
-
   let group = nonCadreForm.indicatorGroups.length == 0 ? null : nonCadreForm.indicatorGroups.find(g => g.title === categoryName);
 
   if (!group) {
@@ -638,11 +705,12 @@ const indicatorDialog = reactive({
   loading: false,
   indicatorOptions: [],
   form: {
+    indicatorId: '',
     name: '',
-    score: -3,
-    count: 1,
-    source: '',
-    total: 0,
+    score: 0,
+    occurCount: 1,
+    qcDeptType: '',
+    scoreResult: 0,
     rewardDetails: '',
     reward: 0,
     penaltyDetails: '',
@@ -668,24 +736,7 @@ async function searchIndicators(query) {
   }
 }
 
-// 干部表单数据
-const cadreForm = reactive({
-  employeeName: '',
-  position: '',
-  area: '',
-  assessmentMonth: '',
-  redLineDeduction: 0,
-  redLineExemption: '',
-  violationRankingDeduction: 0,
-  violationRankingExemption: '',
-  skillRankingDeduction: 0,
-  skillRankingExemption: '',
-  totalScore: 0,
-  assessmentResult: '',
-  applicationMethod: '',
-  assessmentResultRemark: '',
-  applicationMethodRemark: ''
-})
+
 
 // 弹窗配置
 const dialog = reactive({
@@ -708,6 +759,16 @@ const showDetailModal = (title, content) => {
   detailModal.visible = true
 }
 
+const formatAccordList = (list) => {
+  if (!list || !Array.isArray(list) || list.length === 0) return ''
+  return list.map(item => {
+    const name = item.indicatorName || item.name || ''
+    const score = item.score !== undefined ? item.score : ''
+    const count = item.occurCount !== undefined ? item.occurCount : ''
+    return `${name} ${score}分 x ${count}次`
+  }).join('\n')
+}
+
 // 数据列表
 const nonCadreList = ref([])
 const cadreList = ref([])
@@ -715,22 +776,20 @@ const cadreList = ref([])
 const userList = ref([])
 const teamLeaderOptions = ref([])
 const supervisorOptions = ref([])
+const managerOptions = ref([])
 
 
 
 // 非干部表单验证规则
 const nonCadreRules = {
-  userName: [{ required: true, message: '员工姓名不能为空', trigger: 'change' }],
-  employmentType: [{ required: true, message: '用工形式不能为空', trigger: 'change' }],
-  assessmentTeam: [{ required: true, message: '考核组不能为空', trigger: 'change' }],
-  assessmentMonth: [{ required: true, message: '考核月份不能为空', trigger: 'change' }]
+  userId: [{ required: true, message: '姓名不能为空', trigger: 'change' }]
 }
 
 
 
-async function loadUserList() {
+async function loadUserList(month) {
   try {
-    const res = await listAllUser()
+    const res = await listUserPerformance({ month })
     userList.value = res.data || []
   } catch (error) {
     console.error('获取员工列表失败:', error)
@@ -755,23 +814,52 @@ async function loadSupervisorOptions(userId) {
   }
 }
 
-async function handleUserChange(userName) {
-  if (!userName) {
+async function loadManagerOptions(userId) {
+  try {
+    const res = await selectUserLeaderListByCondition({ roleKeyList: ['jingli'], userId })
+    managerOptions.value = res.data || []
+  } catch (error) {
+    console.error('获取经理列表失败:', error)
+  }
+}
+
+async function handleUserChange(userId) {
+  if (!userId) {
     teamLeaderOptions.value = []
     supervisorOptions.value = []
+    managerOptions.value = []
+    nonCadreForm.deputyTeamLeaderId = ''
     nonCadreForm.deputyTeamLeaderName = ''
+    nonCadreForm.deputySupervisorId = ''
     nonCadreForm.deputySupervisorName = ''
+    nonCadreForm.deputyManagerId = ''
+    nonCadreForm.deputyManagerName = ''
     return
   }
 
-  const user = userList.value.find(u => u.userName === userName)
-  if (user && user.userId) {
+  const user = userList.value.find(u => u.userId === userId)
+  if (user && user.nickName) {
     await Promise.all([
       loadTeamLeaderOptions(user.userId),
-      loadSupervisorOptions(user.userId)
+      loadSupervisorOptions(user.userId),
+      loadManagerOptions(user.userId)
     ])
+    const role = user.roles && user.roles[0] || {}
+    nonCadreForm.userName = user.nickName
+    nonCadreForm.roleName = role?.roleName
+    nonCadreForm.roleKey = role?.roleKey
+    nonCadreForm.roleId = role?.roleId
+    nonCadreForm.employmentType = user.employmentType
+    nonCadreForm.post = user.post
+    nonCadreForm.assessmentTeam = user.assessmentTeam
+    nonCadreForm.assessmentTeamDesc = user.assessmentTeamDesc
+
+    nonCadreForm.deputyTeamLeaderId = ''
     nonCadreForm.deputyTeamLeaderName = ''
+    nonCadreForm.deputySupervisorId = ''
     nonCadreForm.deputySupervisorName = ''
+    nonCadreForm.deputyManagerId = ''
+    nonCadreForm.deputyManagerName = ''
   }
 }
 
@@ -832,40 +920,67 @@ const handleAdd = () => {
   dialog.title = currentTab.value === 'non-cadre' ? '新增非干部月度考核' : '新增干部月度考核'
 
   if (currentTab.value === 'non-cadre') {
-    loadUserList()
+    const emptyForm = getEmptyNonCadreForm()
+    Object.keys(emptyForm).forEach(key => {
+      nonCadreForm[key] = emptyForm[key]
+    })
+    const month = nonCadreForm.assessmentMonth.replace('-', '')
+    loadUserList(month)
     teamLeaderOptions.value = []
     supervisorOptions.value = []
-  }
-
-  // 重置表单数据
-  if (currentTab.value === 'non-cadre') {
-
-    nonCadreForm.indicatorGroups = []
+    managerOptions.value = []
   }
 }
 
 // 编辑
-const handleEdit = (row, type) => {
+const handleEdit = async (row, type) => {
   dialog.visible = true
   dialog.type = type
   dialog.title = '编辑非干部月度考核'
 
   if (type === 'non-cadre') {
-    loadUserList().then(() => {
-      if (row.userName) {
-        loadTeamLeaderOptions(row.userId)
-        loadSupervisorOptions(row.userId)
-      }
-    })
-  }
-
-  // 填充表单数据
-  if (type === 'non-cadre') {
-    Object.keys(nonCadreForm).forEach(key => {
-      if (row[key] !== undefined) {
-        nonCadreForm[key] = row[key]
-      }
-    })
+    const month = nonCadreForm.assessmentMonth.replace('-', '')
+    loadUserList(month)
+    loadTeamLeaderOptions(row.userId)
+    loadSupervisorOptions(row.userId)
+    loadManagerOptions(row.userId)
+
+    try {
+      const res = await getNonCadreAssessment(row.id)
+
+      const detailList = res.data.personnelMonthlyAssessmentIndicatorDetailList || []
+      const indicatorGroupsMap = {}
+      detailList.forEach(item => {
+        const categoryKey = item.categoryCodeOne || item.categoryNameOne || '未分类'
+        if (!indicatorGroupsMap[categoryKey]) {
+          indicatorGroupsMap[categoryKey] = {
+            title: item.categoryNameOne || '未分类',
+            items: []
+          }
+        }
+        indicatorGroupsMap[categoryKey].items.push({
+          ...item
+        })
+      })
+      const indicatorGroups = Object.values(indicatorGroupsMap)
+
+      Object.keys(res.data).forEach(key => {
+        if (key === 'assessmentMonth' && res.data[key]) {
+          const val = res.data[key]
+          if (typeof val === 'string' && val.length === 6 && /^\d+$/.test(val)) {
+            nonCadreForm[key] = val.substring(0, 4) + '-' + val.substring(4, 6)
+          } else {
+            nonCadreForm[key] = val
+          }
+        } else if (key !== 'personnelMonthlyAssessmentIndicatorDetailList') {
+          nonCadreForm[key] = res.data[key]
+        }
+      })
+      nonCadreForm.indicatorGroups = indicatorGroups
+    } catch (error) {
+      console.error('获取详情失败:', error)
+      ElMessage.error('获取详情失败')
+    }
   }
 }
 
@@ -895,15 +1010,29 @@ const submitForm = async () => {
 
   try {
     if (dialog.type === 'non-cadre') {
+      const submitData = { ...nonCadreForm }
+
+      if (submitData.assessmentMonth) {
+        submitData.assessmentMonth = submitData.assessmentMonth.replace('-', '')
+      }
+
+      if (submitData.indicatorGroups && submitData.indicatorGroups.length > 0) {
+        submitData.personnelMonthlyAssessmentIndicatorDetailList = submitData.indicatorGroups.flatMap(group =>
+          group.items.map(item => ({
+            ...item
+          }))
+        )
+        delete submitData.indicatorGroups
+      }
+
       if (dialog.title === '新增非干部月度考核') {
-        await addNonCadreAssessment(nonCadreForm)
+        await addNonCadreAssessment(submitData)
         ElMessage.success('新增成功')
       } else {
-        await updateNonCadreAssessment(nonCadreForm)
+        await updateNonCadreAssessment(submitData)
         ElMessage.success('更新成功')
       }
     } else {
-      // 干部数据API（待实现）
       ElMessage.success('操作成功')
     }
 
@@ -941,20 +1070,27 @@ const handleExport = async () => {
 // 生成本月考核表
 const generateMonthlyAssessment = async () => {
   try {
-    ElMessageBox.confirm('是否生成本月干部考核数据？', '提示', {
+    const tabText = currentTab.value === 'non-cadre' ? '非干部' : '干部'
+    ElMessageBox.confirm(`是否生成本月${tabText}考核数据？`, '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
     }).then(async () => {
       loading.value = true
-      // 使用当前年月的日期
       const now = new Date()
-      const params = {
-        year: now.getFullYear(),
-        month: now.getMonth() + 1
+      const currentMonth = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}`
+
+      if (currentTab.value === 'non-cadre') {
+        const res = await generateNonCadreAssessment({ month: currentMonth })
+        ElMessage.success('生成成功')
+      } else {
+        const params = {
+          year: now.getFullYear(),
+          month: now.getMonth() + 1
+        }
+        const res = await generateCadreAssessment(params)
+        ElMessage.success('生成成功')
       }
-      const res = await generateCadreAssessment(params)
-      ElMessage.success('生成成功')
       getList()
     }).catch(() => { })
   } catch (error) {
@@ -986,9 +1122,9 @@ const addIndicator = () => {
   indicatorDialog.form = {
     name: '',
     score: -3,
-    count: 1,
-    source: '',
-    total: 0,
+    occurCount: 1,
+    qcDeptType: '',
+    scoreResult: 0,
     rewardDetails: '',
     reward: 0,
     penaltyDetails: '',
@@ -1021,20 +1157,26 @@ const deleteIndicator = (groupIndex, itemIndex) => {
 
 // 指标名称变化时更新分值
 const onIndicatorNameChange = (value) => {
-  const selected = indicatorDialog.indicatorOptions.find(item => item.name === value)
+  console.log(value, indicatorDialog.indicatorOptions, "indicatorDialog.indicatorOptions")
+  const selected = indicatorDialog.indicatorOptions.find(item => item.id === value)
   if (selected) {
-    indicatorDialog.form = { ...selected, count: 1 }
+    indicatorDialog.form = { ...selected, occurCount: 1 }
     updateTotal()
   }
 }
 
 // 更新总分
 const updateTotal = () => {
-  indicatorDialog.form.total = indicatorDialog.form.score * indicatorDialog.form.count
+  indicatorDialog.form.scoreResult = indicatorDialog.form.score * indicatorDialog.form.occurCount
 }
 
 // 保存指标
 const saveIndicator = () => {
+  if (!indicatorDialog.form.indicatorId) {
+    ElMessage.error('请选择指标名称')
+    return
+  }
+
   if (indicatorDialog.mode === 'add') {
     addIndicatorToGroup({ ...indicatorDialog.form })
     ElMessage.success('添加成功')
@@ -1186,7 +1328,7 @@ onMounted(() => {
 
 .indicator-value,
 .indicator-count,
-.indicator-source,
+.indicator-qcDeptType,
 .indicator-total {
   flex: 1;
   font-size: 16px;

src/views/performanceManage/monthlyAssessSum/index.vue

@@ -29,9 +29,9 @@
       
       <!-- 第一行：两个区块 -->
       <div class="chart-row">
-        <!-- 整体分支分布柱状图 -->
+        <!-- 整体分值分布柱状图 -->
         <el-card class="chart-card">
-          <div class="chart-header">整体分支分布柱状图</div>
+          <div class="chart-header">整体分值分布柱状图</div>
           <div ref="overallBarChart" class="chart-container"></div>
         </el-card>
         
@@ -44,9 +44,9 @@
 
       <!-- 第二行：两个区块 -->
       <div class="chart-row">
-        <!-- 各部门分支分布对比图 -->
+        <!-- 各部门分值分布对比图 -->
         <el-card class="chart-card">
-          <div class="chart-header">各部门分支分布对比图</div>
+          <div class="chart-header">各部门分值分布对比图</div>
           <div ref="departmentComparisonChart" class="chart-container"></div>
         </el-card>
         
@@ -54,11 +54,9 @@
         <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="range" label="区间" align="center" min-width="100" />
-            <el-table-column prop="simulationScore" label="2026年1月模拟分数汇总" align="center" min-width="150" />
-            <el-table-column prop="team1" label="一队" align="center" min-width="100" />
-            <el-table-column prop="team2" label="二队" align="center" min-width="100" />
-            <el-table-column prop="team3" label="三队" align="center" min-width="100" />
+            <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>
         </el-card>
       </div>
@@ -72,14 +70,14 @@
       <el-card class="summary-table-card">
         <div class="chart-header">汇总统计</div>
         <el-table :data="classificationTableData" border style="width: 100%; margin-top: 10px;">
-          <el-table-column prop="assessmentGroup" label="考核组人数" align="center" min-width="120" />
-          <el-table-column prop="calculatedImprovement" label="测算待改进人数" align="center" min-width="140" />
-          <el-table-column prop="totalImprovement" label="待改进总人数" align="center" min-width="120" />
-          <el-table-column prop="exemption1" label="豁免" align="center" min-width="80" />
-          <el-table-column prop="actualImprovement" label="实际待改进总人数" align="center" min-width="140" />
-          <el-table-column prop="totalUnqualified" label="不称职总人数" align="center" min-width="120" />
-          <el-table-column prop="exemption2" label="豁免" align="center" min-width="80" />
-          <el-table-column prop="actualUnqualified" label="实际不称职人数" align="center" min-width="140" />
+          <el-table-column prop="assessmentTeamCount" label="考核组人数" align="center" min-width="120" />
+          <el-table-column prop="estimatedImprovementCount" label="测算待改进人数" align="center" min-width="140" />
+          <el-table-column prop="improvementTotalCount" label="待改进总人数" align="center" min-width="120" />
+          <el-table-column prop="improvementExemptedCount" label="待改进豁免" align="center" min-width="100" />
+          <el-table-column prop="actualImprovementCount" label="实际待改进总人数" align="center" min-width="140" />
+          <el-table-column prop="incompetentTotalCount" label="不称职总人数" align="center" min-width="120" />
+          <el-table-column prop="incompetentExemptedCount" label="不称职豁免" align="center" min-width="100" />
+          <el-table-column prop="actualIncompetentCount" label="实际不称职人数" align="center" min-width="140" />
         </el-table>
       </el-card>
 
@@ -113,16 +111,15 @@
           <!-- 左边表格 -->
           <div class="table-section">
             <el-table :data="item.tableData" border style="width: 100%;">
-              <el-table-column prop="brigade" label="大队" align="center" min-width="100" />
-              <el-table-column prop="assessmentGroup" label="考核组" align="center" min-width="100" />
-              <el-table-column prop="groupCount" label="考核组人数" align="center" min-width="120" />
-              <el-table-column prop="calculatedImprovement" label="测算待改进人数" align="center" min-width="140" />
-              <el-table-column prop="improvementCount" label="待改进人数" align="center" min-width="120" />
-              <el-table-column prop="exemption1" label="豁免" align="center" min-width="80" />
-              <el-table-column prop="actualImprovement" label="实际待改进人数" align="center" min-width="140" />
-              <el-table-column prop="unqualifiedCount" label="不称职人数" align="center" min-width="120" />
-              <el-table-column prop="exemption2" label="豁免" align="center" min-width="80" />
-              <el-table-column prop="actualUnqualified" label="实际不称职人数" align="center" min-width="140" />
+              <el-table-column prop="assessmentTeam" label="考核组" align="center" min-width="100" />
+              <el-table-column prop="assessmentTeamCount" label="考核组人数" align="center" min-width="120" />
+              <el-table-column prop="estimatedImprovementCount" label="测算待改进人数" align="center" min-width="140" />
+              <el-table-column prop="improvementTotalCount" label="待改进总人数" align="center" min-width="120" />
+              <el-table-column prop="improvementExemptedCount" label="待改进豁免人数" align="center" min-width="140" />
+              <el-table-column prop="actualImprovementCount" label="实际待改进人数" align="center" min-width="140" />
+              <el-table-column prop="incompetentTotalCount" label="不称职总人数" align="center" min-width="120" />
+              <el-table-column prop="incompetentExemptedCount" label="不称职豁免人数" align="center" min-width="140" />
+              <el-table-column prop="actualIncompetentCount" label="实际不称职人数" align="center" min-width="140" />
             </el-table>
           </div>
           
@@ -180,20 +177,45 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import * as echarts from 'echarts'
 
 // API导入
-//import {  } from '@/api/performance/monthlyAssessSum.js'
+import {
+  getScoreDistribution,
+  getDeptParticipation,
+  getDeptScoreDistribution,
+  getAssessmentSummary,
+  getActualImprovementDistribution,
+  getActualIncompetentDistribution,
+  getAssessmentTeamImprovementDistribution,
+  getAssessmentTeamIncompetentDistribution,
+  getDeptAssessmentTeamStatistics,
+  getBrigadeImprovementDistribution,
+  getBrigadeIncompetentDistribution,
+  getFunctionalDeptSummary,
+  getFunctionalDeptPersonnelDistribution,
+  getFunctionalDeptDistributionPie
+} from '@/api/performance/monthlyAssessSum.js'
 
 // 响应式数据
 const loading = ref(false)
 const queryFormRef = ref()
 
 // 查询参数
+const currentMonth = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`
+
 const queryParams = reactive({
-  assessmentMonth: ''
+  assessmentMonth: currentMonth
+})
+
+const summaryTableTitle = computed(() => {
+  if (queryParams.assessmentMonth) {
+    const [year, month] = queryParams.assessmentMonth.split('-')
+    return `${year}年${parseInt(month)}月模拟分数汇总`
+  }
+  return '模拟分数汇总'
 })
 
 // 图表引用
@@ -209,49 +231,20 @@ const positionPieChart2 = ref(null)
 const traversalChartsRefs = ref({})
 
 // 表格数据
-const summaryTableData = ref([
-  { range: '90-100分', simulationScore: '85', team1: '15', team2: '20', team3: '25' },
-  { range: '80-89分', simulationScore: '120', team1: '30', team2: '35', team3: '40' },
-  { range: '70-79分', simulationScore: '95', team1: '25', team2: '30', team3: '35' },
-  { range: '60-69分', simulationScore: '60', team1: '15', team2: '20', team3: '25' },
-  { range: '60分以下', simulationScore: '20', team1: '5', team2: '8', team3: '7' }
-])
+const summaryTableData = ref([])
+const summaryTableColumns = ref([])
 
 const classificationTableData = ref([
-  { 
-    assessmentGroup: '100', 
-    calculatedImprovement: '15', 
-    totalImprovement: '12', 
-    exemption1: '2', 
-    actualImprovement: '10', 
-    totalUnqualified: '5', 
-    exemption2: '1', 
-    actualUnqualified: '4'
-  }
+
 ])
 
 // 遍历数据
 const traversalData1 = ref([
-  {
-    title: '大队考核统计',
-    tableData: [
-      { brigade: '一大队', assessmentGroup: '一组', groupCount: 50, calculatedImprovement: 8, improvementCount: 6, exemption1: 1, actualImprovement: 5, unqualifiedCount: 2, exemption2: 0, actualUnqualified: 2 },
-      { brigade: '一大队', assessmentGroup: '二组', groupCount: 45, calculatedImprovement: 7, improvementCount: 5, exemption1: 1, actualImprovement: 4, unqualifiedCount: 1, exemption2: 0, actualUnqualified: 1 },
-      { brigade: '二大队', assessmentGroup: '一组', groupCount: 55, calculatedImprovement: 9, improvementCount: 7, exemption1: 1, actualImprovement: 6, unqualifiedCount: 3, exemption2: 1, actualUnqualified: 2 },
-      { brigade: '二大队', assessmentGroup: '二组', groupCount: 48, calculatedImprovement: 6, improvementCount: 5, exemption1: 0, actualImprovement: 5, unqualifiedCount: 2, exemption2: 0, actualUnqualified: 2 }
-    ]
-  }
+  
 ])
 
 const traversalData2 = ref([
-  {
-    title: '岗位考核统计',
-    tableData: [
-      { brigade: '安检员', assessmentGroup: '一组', groupCount: 60, calculatedImprovement: 10, improvementCount: 8, exemption1: 1, actualImprovement: 7, unqualifiedCount: 3, exemption2: 0, actualUnqualified: 3 },
-      { brigade: '安检员', assessmentGroup: '二组', groupCount: 55, calculatedImprovement: 8, improvementCount: 6, exemption1: 1, actualImprovement: 5, unqualifiedCount: 2, exemption2: 0, actualUnqualified: 2 },
-      { brigade: '设备操作员', assessmentGroup: '一组', groupCount: 40, calculatedImprovement: 5, improvementCount: 4, exemption1: 0, actualImprovement: 4, unqualifiedCount: 1, exemption2: 0, actualUnqualified: 1 }
-    ]
-  }
+  
 ])
 
 // 图表实例
@@ -266,7 +259,7 @@ let positionPieChart2Instance = null
 // 初始化图表
 const initCharts = () => {
   nextTick(() => {
-    // 整体分支分布柱状图
+    // 整体分值分布柱状图
     if (overallBarChart.value) {
       overallBarChartInstance = echarts.init(overallBarChart.value)
       overallBarChartInstance.setOption({
@@ -293,7 +286,7 @@ const initCharts = () => {
       })
     }
 
-    // 各部门分支分布对比图
+    // 各部门分值分布对比图
     if (departmentComparisonChart.value) {
       departmentComparisonChartInstance = echarts.init(departmentComparisonChart.value)
       departmentComparisonChartInstance.setOption({
@@ -485,9 +478,206 @@ const handleResize = () => {
 const getList = async () => {
   loading.value = true
   try {
-    // const res = await getNonCadreMonthlyScoreSum(queryParams)
-    // // 这里可以根据实际API返回的数据更新图表和表格数据
-    // console.log('获取汇总数据:', res)
+    const results = await Promise.allSettled([
+      getScoreDistribution(queryParams),
+      getDeptParticipation(queryParams),
+      getDeptScoreDistribution(queryParams),
+      getAssessmentSummary(queryParams),
+      getActualImprovementDistribution(queryParams),
+      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
+
+    if (scoreDistRes.status === 'fulfilled' && scoreDistRes.value.data) {
+      const data = scoreDistRes.value.data
+      if (overallBarChartInstance && Array.isArray(data)) {
+        overallBarChartInstance.setOption({
+          xAxis: { data: data.map(item => item.scoreRange) },
+          series: [{ data: data.map(item => item.count) }]
+        })
+      }
+    }
+
+    if (deptPartRes.status === 'fulfilled' && deptPartRes.value.data) {
+      const data = deptPartRes.value.data
+      if (participantPieChartInstance && Array.isArray(data)) {
+        participantPieChartInstance.setOption({
+          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+        })
+      }
+    }
+
+    if (deptScoreRes.status === 'fulfilled' && deptScoreRes.value.data) {
+      const data = deptScoreRes.value.data
+      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',
+          data: data.map(item => {
+            const deptData = item.deptCounts.find(d => d.deptId === dept.deptId)
+            return deptData ? deptData.count : 0
+          })
+        }))
+
+        departmentComparisonChartInstance.setOption({
+          legend: { data: firstDeptCounts.map(d => d.deptName) },
+          xAxis: { data: xAxisData },
+          series: series
+        })
+
+        summaryTableColumns.value = firstDeptCounts
+        summaryTableData.value = data.map(item => {
+          const row = {
+            rangeLabel: item.rangeLabel,
+            totalCount: item.totalCount
+          }
+          item.deptCounts.forEach(dept => {
+            row['team' + dept.deptId] = dept.count
+          })
+          return row
+        })
+      }
+    }
+
+    if (assessmentSumRes.status === 'fulfilled' && assessmentSumRes.value.data) {
+      const data = assessmentSumRes.value.data
+      if (data && typeof data === 'object') {
+        classificationTableData.value = [data]
+      }
+    }
+
+    if (actualImproveRes.status === 'fulfilled' && actualImproveRes.value.data) {
+      const data = actualImproveRes.value.data
+      if (brigadePieChart1Instance && Array.isArray(data)) {
+        brigadePieChart1Instance.setOption({
+          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+        })
+      }
+    }
+
+    if (actualIncompRes.status === 'fulfilled' && actualIncompRes.value.data) {
+      const data = actualIncompRes.value.data
+      if (brigadePieChart2Instance && Array.isArray(data)) {
+        brigadePieChart2Instance.setOption({
+          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+        })
+      }
+    }
+
+    if (teamImproveRes.status === 'fulfilled' && teamImproveRes.value.data) {
+      const data = teamImproveRes.value.data
+      if (positionPieChart1Instance && Array.isArray(data)) {
+        positionPieChart1Instance.setOption({
+          series: [{ data: data.map(item => ({ name: item.assessmentTeam, value: item.count })) }]
+        })
+      }
+    }
+
+    if (teamIncompRes.status === 'fulfilled' && teamIncompRes.value.data) {
+      const data = teamIncompRes.value.data
+      if (positionPieChart2Instance && Array.isArray(data)) {
+        positionPieChart2Instance.setOption({
+          series: [{ data: data.map(item => ({ name: item.assessmentTeam, value: item.count })) }]
+        })
+      }
+    }
+
+    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 }
+        }
+        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 }
+        }
+        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
+        }
+      })
+      
+      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]) {
+            const barChart = echarts.init(traversalChartsRefs.value[chartKey])
+            barChart.setOption({
+              series: [{ data: filteredData }]
+            })
+          }
+          
+          if (traversalChartsRefs.value[pieChartKey]) {
+            const pieChart = echarts.init(traversalChartsRefs.value[pieChartKey])
+            pieChart.setOption({
+              series: [{ data: filteredData }]
+            })
+          }
+        })
+      })
+    }
   } catch (error) {
     console.error('获取汇总数据失败:', error)
     ElMessage.error('获取汇总数据失败')

src/views/system/dept/index.vue

@@ -125,6 +125,14 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
+                  <el-form-item label="职能部门" prop="isFunctionalDept">
+                     <el-select v-model="form.isFunctionalDept" placeholder="请选择">
+                        <el-option :label="'是'" :value="'1'" />
+                        <el-option :label="'否'" :value="'0'" />
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
                   <el-form-item label="显示排序" prop="orderNum">
                      <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
                   </el-form-item>