Merge branch 'personnelPerformance' into dev

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" />
@@ -291,8 +292,9 @@
             <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.indicatorName }}</div>
-              <div class="indicator-value" v-if="item.categoryNameOne != '红线指标'">{{ item.score > 0 ? '+' : '' }}{{ item.score
-                }}/次
+              <div class="indicator-value" v-if="item.categoryNameOne != '红线指标'">{{ item.score > 0 ? '+' : '' }}{{
+                item.score
+              }}/次
               </div>
               <div class="indicator-count">{{ item.occurCount }}次</div>
               <div class="indicator-total">{{ item.scoreResult > 0 ? '+' : '' }}{{ item.scoreResult }}</div>
@@ -537,28 +539,32 @@
         </el-form-item>
 
         <el-form-item label="记录明细">
-          <el-table :data="indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList" border max-height="400" >
+          <el-table :data="indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList" border
+            max-height="400">
             <el-table-column label="序号" type="index" width="60" align="center" />
             <el-table-column label="日期" width="180">
               <template #default="scope">
-                <el-date-picker v-model="scope.row.recordDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" />
+                <el-date-picker v-model="scope.row.recordDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期"
+                  style="width: 100%" />
               </template>
             </el-table-column>
-            <el-table-column label="检查部门" >
+            <el-table-column label="检查部门">
               <template #default="scope">
                 <el-select v-model="scope.row.qcDeptType" placeholder="请选择" clearable>
-                  <el-option v-for="item in base_performance_indicator_qc_dept_type" :key="item.value" :label="item.label" :value="item.value" />
+                  <el-option v-for="item in base_performance_indicator_qc_dept_type" :key="item.value"
+                    :label="item.label" :value="item.value" />
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="扣罚明细"  v-if="indicatorDialog.form.score < 0">
+            <el-table-column label="扣罚明细" v-if="indicatorDialog.form.score < 0">
               <template #default="scope">
                 <el-input v-model="scope.row.rewardPunishmentDetail" type="textarea" :rows="1" placeholder="请输入扣罚明细" />
               </template>
             </el-table-column>
-            <el-table-column label="扣罚（元）"  v-if="indicatorDialog.form.score < 0">
+            <el-table-column label="扣罚（元）" v-if="indicatorDialog.form.score < 0">
               <template #default="scope">
-                <el-input-number v-model="scope.row.amount" :max="0" :precision="2" style="width: 170px;" @change="updateTotal" />
+                <el-input-number v-model="scope.row.amount" :max="0" :precision="2" style="width: 170px;"
+                  @change="updateTotal" />
               </template>
             </el-table-column>
             <el-table-column label="奖励明细" v-if="indicatorDialog.form.score > 0">
@@ -566,18 +572,19 @@
                 <el-input v-model="scope.row.rewardPunishmentDetail" type="textarea" :rows="1" placeholder="请输入奖励明细" />
               </template>
             </el-table-column>
-            <el-table-column label="奖励（元）"  v-if="indicatorDialog.form.score > 0">
+            <el-table-column label="奖励（元）" v-if="indicatorDialog.form.score > 0">
               <template #default="scope">
-                <el-input-number v-model="scope.row.amount" :min="0" :precision="2" style="width: 170px;" @change="updateTotal" />
+                <el-input-number v-model="scope.row.amount" :min="0" :precision="2" style="width: 170px;"
+                  @change="updateTotal" />
               </template>
             </el-table-column>
-            <el-table-column label="操作"align="center">
+            <el-table-column label="操作" align="center">
               <template #default="scope">
                 <el-button type="danger" link icon="Delete" @click="removeRewardPunishmentDetail(scope.$index)" />
               </template>
             </el-table-column>
           </el-table>
-          
+
         </el-form-item>
       </el-form>
 
@@ -758,7 +765,7 @@ const indicatorDialog = reactive({
     value: 'id',
     label: 'name',
     children: 'indicatorList',
-    checkStrictly: false,
+
     emitPath: false
   },
   rules: {
@@ -830,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: []
           }))
         }
 
@@ -840,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: []
       }))
     }
 
@@ -905,10 +912,12 @@ const showDetailModal = (title, content) => {
 const formatAccordList = (list) => {
   if (!list || !Array.isArray(list) || list.length === 0) return ''
   return list.map(item => {
+    const detail = item.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList[0] || {};
+    const date = detail.recordDate || ''
     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}次`
+    return `${date} ${name} ${score}分 x ${count}次`
   }).join('\n')
 }
 
@@ -1261,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,
           }))
         )
@@ -1345,16 +1354,7 @@ const generateMonthlyAssessment = async () => {
   }
 }
 
-// 获取考核结果文本
-const getResultText = (value) => {
-  const map = {
-    'excellent': '优秀',
-    'good': '良好',
-    'qualified': '合格',
-    'unqualified': '不称职'
-  }
-  return map[value] || ''
-}
+
 
 // 添加指标 - 打开新增模态框
 const addIndicator = () => {
@@ -1379,6 +1379,7 @@ const addIndicator = () => {
 
 // 编辑指标 - 打开编辑模态框
 const editIndicator = async (groupIndex, itemIndex) => {
+  await loadIndicatorCascaderOptions()
   const item = nonCadreForm.indicatorGroups[groupIndex].items[itemIndex]
   indicatorDialog.visible = true
   indicatorDialog.title = '编辑扣分指标'
@@ -1386,10 +1387,11 @@ const editIndicator = async (groupIndex, itemIndex) => {
   indicatorDialog.groupIndex = groupIndex
   indicatorDialog.itemIndex = itemIndex
 
-  await loadIndicatorCascaderOptions()
-  await nextTick()
 
+  await nextTick()
   indicatorDialog.form = { ...item }
+  console.log(indicatorDialog.form, "indicatorDialog.form")
+
   if (!indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList) {
     indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = []
   }
@@ -1408,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: '合格' },
@@ -542,6 +559,9 @@ const getList = async () => {
         }))
       }
 
+      const totalRowData = statisticsData[1]?.assessmentTeams[0] || {}
+
+
       // 计算总计用于标题
       const totalImprovement = tableData.reduce((sum, item) => sum + (item.actualImprovementCount || 0), 0)
       const totalIncompetent = tableData.reduce((sum, item) => sum + (item.actualIncompetentCount || 0), 0)
@@ -549,7 +569,7 @@ const getList = async () => {
       return {
         title: brigade.deptName,
         deptId: brigade.deptId,
-        tableData,
+        tableData: [...tableData, totalRowData],
         improveData: brigadeImproveData,
         incompData: brigadeIncompData,
         totalImprovement,
@@ -575,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 })) }]
         })
       }
     }
@@ -626,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 })) }]
         })
       }
     }
@@ -635,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 })) }]
         })
       }
     }
@@ -644,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 })) }]
         })
       }
     }
@@ -653,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 })) }]
         })
       }
     }
@@ -716,7 +736,7 @@ const getList = async () => {
           pieData: deptPieData.map(p => ({ name: selectDictLabel(assessment_team.value, p.assessmentTeam), value: p.count }))
         }
       })
-    
+
       nextTick(() => {
         traversalData2.value.forEach((item, index) => {
           const chartKey = `barChart_${index}`
@@ -1338,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;