Merge branch 'personnelPerformance' into dev

src/views/performanceManage/monthlyAssess/index.vue

@@ -12,8 +12,8 @@
     <!-- 查询条件 -->
     <div class="filter-container">
       <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="search-form">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable style="width: 200px" />
+        <el-form-item label="姓名" prop="userName">
+          <el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable style="width: 200px" />
         </el-form-item>
 
         <el-form-item label="考核月份" prop="assessmentMonth">
@@ -21,6 +21,28 @@
             value-format="YYYY-MM" style="width: 200px" />
         </el-form-item>
 
+        <template v-if="currentTab === 'non-cadre'">
+          <el-form-item label="岗位" prop="post">
+            <el-select v-model="queryParams.post" placeholder="请选择岗位" clearable style="width: 200px">
+              <el-option v-for="item in post" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="考核组" prop="assessmentTeam">
+            <el-select v-model="queryParams.assessmentTeam" placeholder="请选择考核组" clearable style="width: 200px">
+              <el-option v-for="item in assessment_team" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="考核结果" prop="assessmentResult">
+            <el-input v-model="queryParams.assessmentResult" placeholder="请输入考核结果" clearable style="width: 200px" />
+          </el-form-item>
+
+          <el-form-item label="豁免" prop="exemption">
+            <el-input v-model="queryParams.exemption" placeholder="请输入豁免" clearable style="width: 200px" />
+          </el-form-item>
+        </template>
+
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -39,7 +61,7 @@
       <div v-else class="left-buttons"></div>
 
       <div class="right-buttons">
-        <el-button type="primary" @click="generateMonthlyAssessment">生成本月考核表</el-button>
+        <el-button type="primary" :disabled="!queryParams.assessmentMonth" @click="generateMonthlyAssessment">生成本月考核表</el-button>
       </div>
     </div>
 
@@ -171,9 +193,9 @@
 
     <!-- 编辑/新增弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" :close-on-click-modal="false"
-      destroy-on-close>
+      destroy-on-close >
       <!-- 非干部表单 -->
-      <el-form v-if="dialog.type === 'non-cadre'" :model="nonCadreForm" ref="formRef" :rules="nonCadreRules"
+      <el-form v-loading="dialog.loading" v-if="dialog.type === 'non-cadre'" :model="nonCadreForm" ref="formRef" :rules="nonCadreRules"
         label-width="380px" class="form-container">
         <!-- 第一部分：基础信息 -->
         <el-row :gutter="20">
@@ -596,8 +618,12 @@ watch(() => currentTab.value, () => {
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  name: '',
-  assessmentMonth: ''
+  userName: '',
+  assessmentMonth: '',
+  post: '',
+  assessmentTeam: '',
+  assessmentResult: '',
+  exemption: ''
 })
 
 const currentMonthDefault = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`
@@ -840,7 +866,8 @@ function findIndicatorById(tree, targetId) {
 const dialog = reactive({
   visible: false,
   title: '',
-  type: 'non-cadre'
+  type: 'non-cadre',
+  loading: false
 })
 
 // 详情模态框
@@ -886,11 +913,14 @@ const nonCadreRules = {
 
 
 async function loadUserList(month) {
+  dialog.loading = true
   try {
     const res = await listUserPerformance({ month })
     userList.value = res.data || []
   } catch (error) {
     console.error('获取员工列表失败:', error)
+  } finally {
+    dialog.loading = false
   }
 }
 
@@ -1240,22 +1270,23 @@ const handleExport = async () => {
 const generateMonthlyAssessment = async () => {
   try {
     const tabText = currentTab.value === 'non-cadre' ? '非干部' : '干部'
-    ElMessageBox.confirm(`是否生成本月${tabText}考核数据？`, '提示', {
+    ElMessageBox.confirm(`是否生成${queryParams.assessmentMonth}考核数据？`, '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
     }).then(async () => {
       loading.value = true
-      const now = new Date()
-      const currentMonth = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}`
+      const queryMonth = queryParams.assessmentMonth.replace('-', '')
+      const queryYear = parseInt(queryMonth.substring(0, 4))
+      const queryMonthNum = parseInt(queryMonth.substring(4, 6))
 
       if (currentTab.value === 'non-cadre') {
-        const res = await generateNonCadreAssessment({ month: currentMonth })
+        const res = await generateNonCadreAssessment({ month: queryMonth })
         ElMessage.success('生成成功')
       } else {
         const params = {
-          year: now.getFullYear(),
-          month: now.getMonth() + 1
+          year: queryYear,
+          month: queryMonthNum
         }
         const res = await generateCadreAssessment(params)
         ElMessage.success('生成成功')

src/views/performanceManage/monthlyAssessSum/index.vue

@@ -147,27 +147,26 @@
           <!-- 左边表格 -->
           <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="80" />
+              <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="80" />
+              <el-table-column prop="actualIncompetentCount" label="实际不称职人数" align="center" min-width="140" />
             </el-table>
           </div>
 
           <!-- 右边柱状图和饼状图 -->
           <div class="chart-section">
             <div class="bar-chart-container">
-              <div class="chart-title">考核分数分布</div>
+              <div class="chart-title">{{ item.title }}考核人数与待改进情况</div>
               <div :ref="el => setTraversalChartRef(el, `barChart_${index}`)" class="bar-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, `pieChart3_${index}`)" class="pie-chart"></div>
             </div>
           </div>
@@ -314,7 +313,7 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '70%',
+          radius: '50%',
           data: [
             { value: 120, name: '一队' },
             { value: 150, name: '二队' },
@@ -331,7 +330,7 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '70%',
+          radius: '50%',
           data: [
             { value: 45, name: '优秀' },
             { value: 280, name: '合格' },
@@ -348,7 +347,7 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '70%',
+          radius: '50%',
           data: [
             { value: 150, name: '安检员' },
             { value: 120, name: '设备操作员' },
@@ -366,7 +365,7 @@ const initCharts = () => {
         tooltip: { trigger: 'item' },
         series: [{
           type: 'pie',
-          radius: '70%',
+          radius: '50%',
           data: [
             { value: 35, name: '优秀' },
             { value: 320, name: '合格' },
@@ -491,11 +490,11 @@ const getList = async () => {
       }
       return formatted
     }
-    
+
     // 获取大队列表
     const brigadeListRes = await listDept()
     const brigadeList = (brigadeListRes.data || []).filter(item => item.deptType === 'BRIGADE' && item.isFunctionalDept == 0)
-    
+
     // 其他接口调用
     const formattedQueryParams = formatParams(queryParams)
     const results = await Promise.allSettled([
@@ -522,23 +521,23 @@ const getList = async () => {
         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,
@@ -550,8 +549,10 @@ const getList = async () => {
       }
     })
 
-    traversalData1.value = await Promise.all(brigadeDataPromises.filter(item => item.tableData?.length > 0 || item.improveData?.length > 0 || item.incompData?.length > 0))
-
+    traversalData1.value = await Promise.all(brigadeDataPromises)
+    traversalData1.value = traversalData1.value.filter(item => item.tableData?.length > 0 || item.improveData?.length > 0 || item.incompData?.length > 0)
+    console.log(traversalData1.value)
+    // debugger
     if (scoreDistRes.status === 'fulfilled' && scoreDistRes.value.data) {
       const data = scoreDistRes.value.data
       if (overallBarChartInstance && Array.isArray(data)) {
@@ -704,7 +705,7 @@ const getList = async () => {
           pieData: deptPieData.map(p => ({ name: p.assessmentTeam, value: p.count }))
         }
       })
-
+    
       nextTick(() => {
         traversalData2.value.forEach((item, index) => {
           const chartKey = `barChart_${index}`