xujun

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/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,14 +407,14 @@ 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 header = ['组名', '组内排名', '', '项目名称', '一级学科', '二级学科', '申报单位', '申报人', '所属市(州）', '技术专家评分', '财务专家评分', '最终得分'] // 表头
             const filterVal = ['groupName', 'orderNo', 'projNo', 'projName', 'parentName', 'knowledgeName', 'appUnitName', 'personName', 'unitName', 'gradeScore1', 'gradeScore2', 'calculateScore'] // 数据属性
             const list = this.eTableData //请求来的数据
             const merges = ['A1:L1'].concat(this.eMergeList) //需要合并的标题头单元格