student - elective table - 排名列后移

src/views/system/user/profile/components/report-table.vue

@@ -103,7 +103,7 @@
           trigger="click"
         >
           <div>
-            确定拒绝系统给您推荐的<span class="f-primary">{{recommendGroup.groupName}}</span>组合么？
+            确定拒绝系统给您推荐的<span class="f-primary">{{ recommendGroup.groupName }}</span>组合么？
             <el-input
               type="textarea"
               :rows="4"
@@ -287,7 +287,14 @@ export default {
       const stepMatched = this.generation.active == this.generation.current
       const enableApply = !this.generation.currentOpt.decisionMaking
       const enableSignUp = stepMatched && enableApply && !this.readonly
+
       return {
+        rankInGroup: {
+          label: '当前组合实时排名'
+        },
+        rankInGrade: {
+          label: '选科全校排名'
+        },
         allowSelectTips: {
           label: '报名状态'
         },
@@ -356,8 +363,6 @@ export default {
         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
         row.colleges = matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))
         row.subjects = matchedMajors.map(m => m['majorCategoryName'])
-        // this.$set(row,'colleges',matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })))
-        // this.$set(row,'subjects',matchedMajors.map(m => m['majorCategoryName']))
         return row
       })
     },
@@ -502,7 +507,7 @@ export default {
     },
     async handleRejectRecommend() {
       await this.$confirm(`拒绝系统给您推荐的${this.recommendGroup.groupName}组合可能会导致您无法正常录取，确认继续？`)
-      if(!this.regInfo.length) {
+      if (!this.regInfo.length) {
         this.$message.error('拒绝原因不能为空')
         return
       }
@@ -512,7 +517,7 @@ export default {
       rejectRecommend({
         models: rejectRow
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.refreshData()
         }
       }).finally(_ => {

src/views/system/user/profile/components/round-select-resolvers/backTracking-resolver-mixins.js

@@ -7,8 +7,6 @@ export default {
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.backTrackingApply = `${currentGroup.actualCount + currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-        item.rankInGroup = currentGroup.rankInGroup
-        item.rankInGrade = currentGroup.rankInGrade
       })
 
       if (active < 4) {

src/views/system/user/profile/components/round-select-resolvers/backTrackingDM-resolver-mixins.js

@@ -6,8 +6,6 @@ export default {
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-        console.log(currentGroup.groupApprovedCount)
-        console.log(currentGroup.groupIndicator)
         item.supplyIndicator = currentGroup.nextGroupIndicator
         // 录取人数加指标/ 设置人数
         item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`

src/views/system/user/profile/components/round-select-resolvers/primary-resolver-mixins.js

@@ -5,25 +5,14 @@ export default {
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
-        // item.applyCount = `${item.actualCount}/${item.personCount}`
-        // item.rankInGroup = item.rankInGroup
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-
         item.applyCount = `${currentGroup.actualCount} /${currentGroup.personCount}`
-        item.rankInGroup = currentGroup.rankInGroup
-        item.rankInGrade = currentGroup.rankInGrade
       })
 
       if(active < 4){
         return {
           applyCount:{
             label:'选科人数比'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
           }
         }
       }else {

src/views/system/user/profile/components/round-select-resolvers/primaryDM-resolver-mixins.js

@@ -1,32 +1,19 @@
 export default {
   methods: {
     primaryDMResolver(gen, active, context) {
-      console.log('context',context)
-      delete context['rankInGroup']
-      delete context['rankInGrade']
-      console.log('context',context)
-
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.primarySituation = currentGroup.nextGroupIndicator
-        item.rankInGroup = currentGroup.rankInGroup
-        item.rankInGrade = currentGroup.rankInGrade
       })
-      console.log(active)
+
       if (active < 4) {
         return {
           primarySituation: {
             label: '超/缺',
             slot: 'underOver'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
           }
         }
       } else {