Merge branch 'personnelPerformance' into dev

# Conflicts:
#	src/api/system/user.js

src/api/examManage/monthlyAssessPerformance.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询月考成绩列表
+export function listMonthlyScore(query) {
+  return request({
+    url: '/exam/monthlyScore/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/exam/monthlyScore/importTemplate',
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+// 导入月考成绩数据
+export function importData(data) {
+  return request({
+    url: '/exam/monthlyScore/importData',
+    method: 'post',
+    data: data
+  })
+}

src/api/performance/monthlyAssess.js

@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 查询干部月度考核列表
+export function listCadreAssessment(query) {
+  return request({
+    url: '/personnel/cadre-assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 生成本月考核数据
+export function generateCadreAssessment(data) {
+  return request({
+    url: '/personnel/cadre-assessment/generate',
+    method: 'post',
+    data: data
+  })
+}
+
+//查询非干部月度考核列表
+export function listNonCadreAssessment(query) {
+  return request({
+    url: '/personnel/assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+//新增非干部月度考核
+export function addNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'post',
+    data: data
+  })
+}
+//修改非干部月度考核
+export function updateNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'put',
+    data: data
+  })
+}
+//删除非干部月度考核
+export function deleteNonCadreAssessment(ids) {
+  return request({
+    url: `/personnel/assessment/${ids}`,
+    method: 'delete',
+  })
+}
+//导出非干部月度考核列表
+export function exportNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment/export',
+    method: 'post',
+    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

@@ -0,0 +1,113 @@
+import request from '@/utils/request'
+
+export function getScoreDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/score-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDeptParticipation(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-participation',
+    method: 'get',
+    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/performance/nonCadreMonthlyAssess.js

@@ -1,70 +0,0 @@
-import request from '@/utils/request'
-
-// 获取非干部月度考核列表
-export function getNonCadreMonthlyAssessList(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 新增非干部月度考核
-export function addNonCadreMonthlyAssess(data) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新非干部月度考核
-export function updateNonCadreMonthlyAssess(data) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除非干部月度考核
-export function deleteNonCadreMonthlyAssess(id) {
-  return request({
-    url: `/performance/non-cadre-monthly-assess/${id}`,
-    method: 'delete'
-  })
-}
-
-// 导出非干部月度考核数据
-export function exportNonCadreMonthlyAssess(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 获取用工形式选项
-export function getEmploymentTypeOptions() {
-  return request({
-    url: '/performance/non-cadre-monthly-assess/employment-type-options',
-    method: 'get'
-  })
-}
-
-// 获取考核结果选项
-export function getAssessmentResultOptions() {
-  return request({
-    url: '/performance/non-cadre-monthly-assess/assessment-result-options',
-    method: 'get'
-  })
-}
-
-// 获取应用方式选项
-export function getApplicationMethodOptions() {
-  return request({
-    url: '/performance/non-cadre-monthly-assess/application-method-options',
-    method: 'get'
-  })
-}

src/api/performance/nonCadreMonthlyAssessSummary.js

@@ -1,20 +0,0 @@
-import request from '@/utils/request'
-
-// 获取非干部月度考核汇总数据
-export function getNonCadreMonthlyAssessSummary(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess-summary',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出非干部月度考核汇总数据
-export function exportNonCadreMonthlyAssessSummary(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-assess-summary/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/performance/nonCadreMonthlyScoreSum.js

@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-// 获取非干部月度考核分数汇总数据
-export function getNonCadreMonthlyScoreSum(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出非干部月度考核分数汇总文档
-export function exportNonCadreMonthlyScoreSum(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 获取整体分支分布数据
-export function getOverallScoreDistribution(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/overall-distribution',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取参与人数占比数据
-export function getParticipantRatio(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/participant-ratio',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取各部门分支分布对比数据
-export function getDepartmentComparison(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/department-comparison',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取汇总表数据
-export function getSummaryTableData(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/summary-table',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取分类结果汇总数据
-export function getClassificationSummary(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/classification-summary',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取大队分布统计数据
-export function getBrigadeDistribution(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/brigade-distribution',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取岗位分布统计数据
-export function getPositionDistribution(query) {
-  return request({
-    url: '/performance/non-cadre-monthly-score-sum/position-distribution',
-    method: 'get',
-    params: query
-  })
-}

src/api/system/user.js

@@ -159,4 +159,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/examManage/monthlyAssessPerformance/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="年月" prop="yearMonth">
+        <el-date-picker v-model="queryParams.yearMonth" type="month" placeholder="请选择年月" value-format="YYYY-MM" style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="studentName">
+        <el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="科队" prop="team">
+        <el-select v-model="queryParams.team" placeholder="请选择科队" clearable style="width: 200px">
+          <el-option v-for="dict in exam_team" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="岗位" prop="jobPosition">
+        <el-input v-model="queryParams.jobPosition" placeholder="请输入岗位" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trainingPerformanceList" >
+      <el-table-column label="年月" align="center" prop="yearMonth" />
+      <el-table-column label="学生" align="center" prop="studentName" />
+      <el-table-column label="科队" align="center" prop="team">
+        <template #default="scope">
+          <dict-tag :options="exam_team" :value="scope.row.team" />
+        </template>
+      </el-table-column>
+      <el-table-column label="岗位" align="center" prop="jobPosition">
+       
+      </el-table-column>
+      <el-table-column label="综合成绩" align="center" prop="comprehensiveScore" />
+      <el-table-column label="综合用时" align="center" prop="comprehensiveTime" />
+      <el-table-column label="专项成绩" align="center" prop="specialScore" />
+      <el-table-column label="专项用时" align="center" prop="specialTime" />
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:16px;vertical-align: baseline;" @click="handleDownloadTemplate">下载模板</el-link>
+            </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="TrainingPerformance">
+import { listMonthlyScore, downloadTemplate, importData } from "@/api/examManage/monthlyAssessPerformance"
+import request from '@/utils/request'
+import { getToken } from "@/utils/auth"
+import { addDateRange, parseTime } from "@/utils/ruoyi"
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+const { exam_team, post } = proxy.useDict('exam_team', 'post')
+
+const trainingPerformanceList = ref([])
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const dateRange = ref([])
+
+// 导入参数
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/exam/monthlyScore/importData"
+})
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    yearMonth: undefined,
+    studentName: undefined,
+    team: undefined,
+    position: undefined
+  }
+})
+
+const { queryParams } = toRefs(data)
+
+/** 查询月考成绩列表 */
+function getList() {
+  loading.value = true;
+  let params = {
+    ...queryParams.value,
+  }
+  listMonthlyScore(params).then(response => {
+    trainingPerformanceList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "导入"
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function handleDownloadTemplate() {
+  proxy.download("/exam/monthlyScore/importTemplate", {}, `monthly_score_template_${new Date().getTime()}.xlsx`, 'post')
+}
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs["uploadRef"].handleRemove(file)
+  if (response.code === 200) {
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  } else {
+    proxy.$modal.msgError(response.msg)
+  }
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs["uploadRef"].submit()
+}
+
+getList()
+</script>

src/views/system/dept/index.vue

@@ -138,6 +138,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>