xujun

src/api/index.js

@@ -117,6 +117,9 @@ export default {
         },
         getProjectKpitStatistic () {
             return fetch(`/v1/science-admin/com-project-kpit/getProjectKpitStatistic`)
+        },
+        getTalentEvaluationStatistic (params) {
+            return fetch(`/v1/science-admin/statistical/getTalentEvaluationStatistic`, params)
         }
     },
     //单位管理

src/views/talentAssign/index.vue

@@ -33,13 +33,13 @@
     </a-form>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
-      <a-button icon="plus-circle" type="primary" @click="onAddProjectGroup">添加人才分组</a-button>
+      <a-button icon="plus-circle" type="primary" @click="onAddTalentGroup">添加人才分组</a-button>
       <a-button icon="plus-circle" type="primary" @click="onAssignTalentIntoGroup">分配人才进入人才分组</a-button>
       <a-button type="primary" @click="onaAssignDetail">分配明细</a-button>
-      <a-button icon="download" type="primary" @click="exportEvaluationExcel">项目评审结果导出</a-button>
-      <a-button icon="download" type="primary" @click="exportProjGroupScoreExcel">项目分组排名导出</a-button>
+      <a-button icon="download" type="primary" @click="exportEvaluationExcel">人才评审结果导出</a-button>
+      <a-button icon="download" type="primary" @click="exportTalentGroupScoreExcel">人才分组排名导出</a-button>
     </div>
-    <a-table :dataSource="tableData2" :columns="columns2" rowKey="id" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: talentGroupSelectedRowKeys, onChange: onProjGroupSelectChange, type: selectType }">
+    <a-table :dataSource="tableData2" :columns="columns2" rowKey="id" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: talentGroupSelectedRowKeys, onChange: onTalentGroupSelectChange, type: selectType }">
       <template slot="groupName" slot-scope="record">
         <a @click="recordClick(record, 'groupView')">{{record.groupName}}</a>
       </template>
@@ -100,16 +100,11 @@ import talentSelectIntoGroup from '@/views/talentAssign/components/talentSelectI
 import assignDetail from '@/views/talentAssign/components/assignDetail'
 import assignGroupExpertView from '@/views/talentAssign/components/assignGroupExpertView'
 
-import projectGroupAdjust from '@/views/assign/components/projectGroupAdjust'
-import knowledgeSelect from '@/views/peAssign/components/knowledgeSelect'
-import projectStatistic from '@/views/peAssign/components/projectStatistic'
-
-
 
 export default {
   name: "projKeyAssign",
   components: {
-    paraSelect, groupDetail, groupEdit, talentSelectIntoGroup, groupExpertSelect, projectGroupAdjust, assignGroupExpertView, knowledgeSelect, projectStatistic, assignDetail
+    paraSelect, groupDetail, groupEdit, talentSelectIntoGroup, groupExpertSelect, assignGroupExpertView, assignDetail
   },
   data () {
     return {
@@ -228,7 +223,7 @@ export default {
     parChange (value) {
       this.searchForm.knowledgeParentId = value
     },
-    onProjGroupSelectChange (selectedRowKeys) {
+    onTalentGroupSelectChange (selectedRowKeys) {
       this.talentGroupSelectedRowKeys = selectedRowKeys
     },
     recordClick (record, type) {
@@ -271,7 +266,7 @@ export default {
       }
     },
 
-    onAddProjectGroup () {
+    onAddTalentGroup () {
       this.groupId = null
       this.groupEditVisible = true
     },
@@ -355,9 +350,9 @@ export default {
     },
     exportEvaluationExcel () {
       this.loading = true
-      const rowMarks = ['A', 'B', 'C', 'D', 'E', 'P', 'Q']
+      const rowMarks = ['A','B','C','D','L','M']
       
-      this.$api.statistical.getEvaluationExportExcel({ 
+      this.$api.statistical.getTalentEvaluationStatistic({ 
         reportYear: this.reportYear, 
         startRow: 3, 
         rowMarks: rowMarks 
@@ -368,13 +363,13 @@ export default {
 
           import('@/views/utils/Export2Excel').then(excel => {
             try {
-              const multiHeader = [[this.reportYear + '项目评审结果列表', '', '']]
-              const header = ['项目编号', '项目名称', '一级学科', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '专家类型', '专家评分', '评审类别', '评审内容', '评审状态', '总分', '最终得分']
-              const filterVal = ['projNo', 'projName', 'parentName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'expertTypeName', 'evaluationScore', 'evaluationTypeName',  'remark', 'auditStateName', 'totalScore', 'calculateScore']
+              const multiHeader = [[this.reportYear + '人才评审结果列表', '', '']]
+              const header = ['证件号','姓名','人才类别','人才单位','专家证件号','专家姓名','专家单位','专家手机号','专家评分','评审内容','审核状态名称','总分','平均分']
+              const filterVal = ['certId','personName','talentCategoryName','unitName','expertCertId','expertName','expertUnitName','mobile','evaluationScore','remark','auditStateName','totalScore','averageScore']
               const list = this.eTableData
-              const merges = ['A1:Q1'].concat(this.eMergeList)
+              const merges = ['A1:M1'].concat(this.eMergeList)
               const data = list.map(item => filterVal.map(j => item[j]))
-              const filename = this.reportYear + '项目评审结果列表'
+              const filename = this.reportYear + '人才评审结果列表'
               
               excel.exportJsonToExcel({
                 multiHeader,
@@ -408,7 +403,7 @@ export default {
         this.eMergeList = []
       })
     },
-    exportProjGroupScoreExcel () {
+    exportTalentGroupScoreExcel () {
       this.loading = true
 
       const rowMarks = ['A']