Merge branch 'personnelPerformance' into dev

src/views/performanceManage/monthlyAssessSum/index.vue

@@ -202,6 +202,11 @@ import {
   getFunctionalDeptDistributionPie
 } from '@/api/performance/monthlyAssessSum.js'
 import { listDept } from '@/api/system/dept.js'
+import { useDict } from '@/utils/dict'
+import { selectDictLabel } from '@/utils/ruoyi'
+
+// 获取字典数据
+const { assessment_team } = useDict('assessment_team')
 
 // 响应式数据
 const loading = ref(false)
@@ -397,7 +402,7 @@ const initTraversalCharts = () => {
           tooltip: { trigger: 'item' },
           series: [{
             type: 'pie',
-            radius: '70%',
+            radius: '50%',
             data: [
               { value: 120, name: '优秀' },
               { value: 280, name: '合格' },
@@ -415,7 +420,7 @@ const initTraversalCharts = () => {
           tooltip: { trigger: 'item' },
           series: [{
             type: 'pie',
-            radius: '70%',
+            radius: '50%',
             data: [
               { value: 15, name: '已改进' },
               { value: 60, name: '待改进' },
@@ -448,7 +453,7 @@ const initTraversalCharts = () => {
           tooltip: { trigger: 'item' },
           series: [{
             type: 'pie',
-            radius: '70%',
+            radius: '50%',
             data: [
               { value: 150, name: '安检员' },
               { value: 120, name: '设备操作员' },
@@ -531,7 +536,10 @@ const getList = async () => {
       // 解析表格数据
       let tableData = []
       if (statisticsData.length > 0 && statisticsData[0].assessmentTeams) {
-        tableData = statisticsData[0].assessmentTeams
+        tableData = statisticsData[0].assessmentTeams.map(item => ({
+          ...item,
+          assessmentTeam: selectDictLabel(assessment_team.value, item.assessmentTeam)
+        }))
       }
 
       // 计算总计用于标题
@@ -636,7 +644,7 @@ const getList = async () => {
       const data = teamImproveRes.value.data
       if (positionPieChart1Instance && Array.isArray(data)) {
         positionPieChart1Instance.setOption({
-          series: [{ data: data.map(item => ({ name: item.assessmentTeam, value: item.count })) }]
+          series: [{ data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
         })
       }
     }
@@ -645,7 +653,7 @@ const getList = async () => {
       const data = teamIncompRes.value.data
       if (positionPieChart2Instance && Array.isArray(data)) {
         positionPieChart2Instance.setOption({
-          series: [{ data: data.map(item => ({ name: item.assessmentTeam, value: item.count })) }]
+          series: [{ data: data.map(item => ({ name: selectDictLabel(assessment_team.value, item.assessmentTeam), value: item.count })) }]
         })
       }
     }
@@ -662,8 +670,8 @@ const getList = async () => {
             tooltip: { trigger: 'item' },
             series: [{
               type: 'pie',
-              radius: '70%',
-              data: item.improveData.map(d => ({ name: d.assessmentTeam, value: d.count }))
+              radius: '50%',
+              data: item.improveData.map(d => ({ name: selectDictLabel(assessment_team.value, d.assessmentTeam), value: d.count }))
             }]
           })
         }
@@ -674,8 +682,8 @@ const getList = async () => {
             tooltip: { trigger: 'item' },
             series: [{
               type: 'pie',
-              radius: '70%',
-              data: item.incompData.map(d => ({ name: d.assessmentTeam, value: d.count }))
+              radius: '50%',
+              data: item.incompData.map(d => ({ name: selectDictLabel(assessment_team.value, d.assessmentTeam), value: d.count }))
             }]
           })
         }
@@ -696,13 +704,16 @@ const getList = async () => {
         return {
           title: item.deptName,
           deptId: item.deptId,
-          tableData: item.assessmentTeams || [],
+          tableData: (item.assessmentTeams || []).map(t => ({
+            ...t,
+            assessmentTeam: selectDictLabel(assessment_team.value, t.assessmentTeam)
+          })),
           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 }))
+          pieData: deptPieData.map(p => ({ name: selectDictLabel(assessment_team.value, p.assessmentTeam), value: p.count }))
         }
       })
     
@@ -725,7 +736,7 @@ const getList = async () => {
             const pieChart = echarts.init(traversalChartsRefs.value[pieChartKey])
             pieChart.setOption({
               tooltip: { trigger: 'item' },
-              series: [{ type: 'pie', radius: '70%', data: item.pieData }]
+              series: [{ type: 'pie', radius: '50%', data: item.pieData }]
             })
           }
         })
@@ -1358,17 +1369,20 @@ onUnmounted(() => {
 }
 
 .traversal-content {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
+  display: flex;
   gap: 20px;
   padding: 20px;
 }
 
 .table-section {
+  flex: 1;
+  min-width: 0;
   min-height: 400px;
 }
 
 .chart-section {
+  flex: 1;
+  min-width: 0;
   display: grid;
   grid-template-columns: 1fr 1fr;
   gap: 15px;
@@ -1411,10 +1425,15 @@ onUnmounted(() => {
   }
 
   .traversal-content {
-    grid-template-columns: 1fr;
+    flex-direction: column;
     gap: 15px;
   }
 
+  .table-section,
+  .chart-section {
+    min-width: 0;
+  }
+
   .chart-section {
     grid-template-columns: 1fr;
     height: auto;