Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/api/index.js

@@ -120,6 +120,9 @@ export default {
         },
         getTalentEvaluationStatistic (params) {
             return fetch(`/v1/science-admin/statistical/getTalentEvaluationStatistic`, params)
+        },
+        getTalentGroupScoreOrder (params) {
+            return fetch(`/v1/science-admin/statistical/getTalentGroupScoreOrder`, params)
         }
     },
     //单位管理

src/views/report/talent/components/talentEdit.vue

@@ -374,7 +374,7 @@
         <a-row type="flex" class="row_center">
           <a-col :span="24" class="bg-gray">
             <a-form-model-item prop="technicalSkill" :rules="{ required: true, message: '*', trigger: 'blur',}">
-              <a-textarea placeholder="业务技术能力(限5000字)" v-model="formData.technicalSkill" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
+              <my-editor v-model="formData.technicalSkill" id="my_technicalSkill" />
             </a-form-model-item>
           </a-col>
         </a-row>

src/views/report/talent/components/talentInfo.vue

@@ -309,7 +309,9 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="24">
-          <div v-html="value.technicalSkill"></div>
+          <div class="special-middle">
+            <div v-html="value.technicalSkill"></div>
+          </div>
         </a-col>
       </a-row>
     </div>
@@ -567,4 +569,21 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.special-middle div[v-html] {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  word-break: break-all;
+  line-height: 1.5;
+}
+
+/* 或者更具体地针对包含v-html的div */
+.special-middle > div {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  word-break: break-all;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file

src/views/talentAssign/index.vue

@@ -407,19 +407,19 @@ export default {
       this.loading = true
 
       const rowMarks = ['A']
-      this.$api.statistical.getProjectGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
+      this.$api.statistical.getTalentGroupScoreOrder({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
         if (data) {
           this.eTableData = data.groupScoreList
           //this.eMergeList = data.mergeList
 
           import('@/views/utils/Export2Excel').then(excel => {
-            const multiHeader = [[this.reportYear + '项目分组排名列表', '', '']] // 标题
-            const header = ['组名', '组内排名', '项目编号', '项目名称', '一级学科', '二级学科', '申报单位', '申报人', '所属市(州）', '技术专家评分', '财务专家评分', '最终得分'] // 表头
-            const filterVal = ['groupName', 'orderNo', 'projNo', 'projName', 'parentName', 'knowledgeName', 'appUnitName', 'personName', 'unitName', 'gradeScore1', 'gradeScore2', 'calculateScore'] // 数据属性
+            const multiHeader = [[this.reportYear + '人才分组排名列表', '', '']] // 标题
+            const header = ['分组名称','组内排名','人才证件号','人才姓名','一级学科','二级学科','申报单位','总分','平均分'] // 表头
+            const filterVal = ['groupName','orderNo','certId','personName','parentName','knowledgeName','appUnitName','totalScore','averageScore'] // 数据属性
             const list = this.eTableData //请求来的数据
-            const merges = ['A1:L1'].concat(this.eMergeList) //需要合并的标题头单元格
+            const merges = ['A1:I1'].concat(this.eMergeList) //需要合并的标题头单元格
             const data = list.map(item => filterVal.map(j => item[j])) // 转换二维数组
-            const filename = this.reportYear + '项目分组排名列表'
+            const filename = this.reportYear + '人才分组排名列表'
             excel.exportJsonToExcel({
               multiHeader, // 标题--非必要
               header, // 表头