perf(monthly-assess): 优化月度考核页面展示与数据处理

1.  新增大队列表列展示
2.  修复指标数据id匹配错误问题
3.  移除冗余工具函数
4.  优化统计图表布局与样式，添加标题和标签格式化
5.  调整饼图半径与显示样式

src/views/performanceManage/monthlyAssess/index.vue

@@ -73,6 +73,7 @@
       <el-table v-loading="loading" :data="nonCadreList" border fit highlight-current-row
         style="width: 100%; margin-top: 20px;" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="大队" prop="brigadeName" align="center" min-width="120" />
         <el-table-column label="用工形式" prop="employmentType" align="center" min-width="100">
           <template #default="scope">
             <dict-tag :options="employment_type" :value="scope.row.employmentType" />
@@ -764,7 +765,7 @@ const indicatorDialog = reactive({
     value: 'id',
     label: 'name',
     children: 'indicatorList',
- 
+
     emitPath: false
   },
   rules: {
@@ -836,7 +837,7 @@ function transformIndicatorTree(treeData) {
 
         if (child.indicatorList && child.indicatorList.length > 0) {
           transformedChild.indicatorList = child.indicatorList.map(indicator => ({
-            ...indicator, name: indicator.name, id: indicator.id, indicatorId: indicator.id, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
+            ...indicator, name: indicator.name, id: indicator.id, indicatorId: indicator.indicatorId, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
           }))
         }
 
@@ -846,7 +847,7 @@ function transformIndicatorTree(treeData) {
 
     if (node.indicatorList && node.indicatorList.length > 0) {
       transformed.indicatorList = node.indicatorList.map(indicator => ({
-        ...indicator, name: indicator.name, id: indicator.id, indicatorId: indicator.id, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
+        ...indicator, name: indicator.name, id: indicator.id, indicatorId: indicator.indicatorId, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
       }))
     }
 
@@ -1269,7 +1270,7 @@ const submitForm = async () => {
           group.items.map(item => ({
             ...item,
             indicatorName: item.name || item.indicatorName,
-            indicatorId: item.id || item.indicatorId,
+            indicatorId: item.indicatorId ,
             indicatorCode: item.code || item.indicatorCode,
           }))
         )
@@ -1353,16 +1354,7 @@ const generateMonthlyAssessment = async () => {
   }
 }
 
-// 获取考核结果文本
-const getResultText = (value) => {
-  const map = {
-    'excellent': '优秀',
-    'good': '良好',
-    'qualified': '合格',
-    'unqualified': '不称职'
-  }
-  return map[value] || ''
-}
+
 
 // 添加指标 - 打开新增模态框
 const addIndicator = () => {
@@ -1418,15 +1410,7 @@ const deleteIndicator = (groupIndex, itemIndex) => {
   }).catch(() => { })
 }
 
-// 指标名称变化时更新分值
-const onIndicatorNameChange = (value) => {
-  console.log(value, indicatorDialog.indicatorOptions, "indicatorDialog.indicatorOptions")
-  const selected = indicatorDialog.indicatorOptions.find(item => item.id === value)
-  if (selected) {
-    indicatorDialog.form = { ...selected, indicatorId: selected.id, indicatorName: selected.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: [] }
-    updateTotal()
-  }
-}
+
 
 // 更新总分
 const updateTotal = () => {

src/views/performanceManage/monthlyAssessSum/index.vue

@@ -88,8 +88,14 @@
         <el-card class="chart-card">
           <div class="chart-header">大队分布统计图</div>
           <div class="pie-charts-container">
-            <div ref="brigadePieChart1" class="pie-chart"></div>
-            <div ref="brigadePieChart2" class="pie-chart"></div>
+            <div class="pie-chart-wrapper">
+              <div class="pie-chart-title">各大队实际待改进人数占比</div>
+              <div ref="brigadePieChart1" class="pie-chart"></div>
+            </div>
+            <div class="pie-chart-wrapper">
+              <div class="pie-chart-title">各大队实际不称职人数占比</div>
+              <div ref="brigadePieChart2" class="pie-chart"></div>
+            </div>
           </div>
         </el-card>
 
@@ -97,8 +103,14 @@
         <el-card class="chart-card">
           <div class="chart-header">岗位分布统计图</div>
           <div class="pie-charts-container">
-            <div ref="positionPieChart1" class="pie-chart"></div>
-            <div ref="positionPieChart2" class="pie-chart"></div>
+            <div class="pie-chart-wrapper">
+              <div class="pie-chart-title">各考核组实际待改进人数占比</div>
+              <div ref="positionPieChart1" class="pie-chart"></div>
+            </div>
+            <div class="pie-chart-wrapper">
+              <div class="pie-chart-title">各考核组实际不称职人数占比</div>
+              <div ref="positionPieChart2" class="pie-chart"></div>
+            </div>
           </div>
         </el-card>
       </div>
@@ -287,6 +299,7 @@ const initCharts = () => {
         series: [{
           type: 'pie',
           radius: '70%',
+          label: { formatter: '{b}: {c}' },
           data: [
             { value: 380, name: '参与考核' },
             { value: 20, name: '未参与考核' }
@@ -318,7 +331,8 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '45%',
+          label: { formatter: '{b}\n{c}' },
           data: [
             { value: 120, name: '一队' },
             { value: 150, name: '二队' },
@@ -335,7 +349,8 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '45%',
+          label: { formatter: '{b}\n{c}' },
           data: [
             { value: 45, name: '优秀' },
             { value: 280, name: '合格' },
@@ -352,7 +367,8 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '45%',
+          label: { formatter: '{b}\n{c}' },
           data: [
             { value: 150, name: '安检员' },
             { value: 120, name: '设备操作员' },
@@ -370,7 +386,8 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '45%',
+          label: { formatter: '{b}\n{c}' },
           data: [
             { value: 35, name: '优秀' },
             { value: 320, name: '合格' },
@@ -578,7 +595,7 @@ const getList = async () => {
       const data = deptPartRes.value.data
       if (participantPieChartInstance && Array.isArray(data)) {
         participantPieChartInstance.setOption({
-          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+          series: [{ label: { formatter: '{b}: {c}' }, data: data.map(item => ({ name: item.deptName, value: item.count })) }]
         })
       }
     }
@@ -629,7 +646,7 @@ const getList = async () => {
       const data = actualImproveRes.value.data
       if (brigadePieChart1Instance && Array.isArray(data)) {
         brigadePieChart1Instance.setOption({
-          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+          series: [{ label: { formatter: '{b}\n{c}' }, data: data.map(item => ({ name: item.deptName, value: item.count })) }]
         })
       }
     }
@@ -638,7 +655,7 @@ const getList = async () => {
       const data = actualIncompRes.value.data
       if (brigadePieChart2Instance && Array.isArray(data)) {
         brigadePieChart2Instance.setOption({
-          series: [{ data: data.map(item => ({ name: item.deptName, value: item.count })) }]
+          series: [{ label: { formatter: '{b}\n{c}' }, data: data.map(item => ({ name: item.deptName, value: item.count })) }]
         })
       }
     }
@@ -647,7 +664,7 @@ const getList = async () => {
       const data = teamImproveRes.value.data
       if (positionPieChart1Instance && Array.isArray(data)) {
         positionPieChart1Instance.setOption({
-          series: [{ data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
+          series: [{ label: { formatter: '{b}\n{c}' }, data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
         })
       }
     }
@@ -656,7 +673,7 @@ const getList = async () => {
       const data = teamIncompRes.value.data
       if (positionPieChart2Instance && Array.isArray(data)) {
         positionPieChart2Instance.setOption({
-          series: [{ data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
+          series: [{ label: { formatter: '{b}\n{c}' }, data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
         })
       }
     }
@@ -1341,6 +1358,20 @@ onUnmounted(() => {
   height: 100%;
 }
 
+.pie-chart-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+
+.pie-chart-title {
+  font-size: 14px;
+  color: #606266;
+  margin-bottom: 10px;
+  text-align: center;
+}
+
 :deep(.el-table) {
   .el-table__header th {
     background-color: #f5f7fa;