ai分析增加列

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

@@ -9,21 +9,25 @@ export default {
         item.supplyBestIndicator = currentGroup.bestInIndicator || '-'
         item.supplyRankInBest = currentGroup.rankInBest ? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '-'
         item.supplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${disenrollAll}` : '-'
+        item.recommendRank = currentGroup.rankInIndicator ? `${currentGroup.rankInIndicator}/${currentGroup.groupIndicator}` : '-'
 
       })
       return {
         groupIndicator: {
           label: '补录剩余计划'
         },
+        supplyRankInDisenroll: {
+          label: '补录人数排名'
+        },
         supplyBestIndicator: {
           label: '补录组合成绩最高人数'
         },
         supplyRankInBest: {
           label: '补录组合成绩最高人数排名'
         },
-        supplyRankInDisenroll: {
-          label: '补录人数排名'
-        }
+        recommendRank: {
+          label: '补录推荐录取排名'
+        },
       }
     }
   }

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

@@ -9,19 +9,24 @@ export default {
         item.towSupplyBestIndicator = currentGroup.bestInIndicator || '-'
         item.towSupplyRankInBest = currentGroup.rankInBest ? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '-'
         item.towSupplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${disenrollAll}` : '-'
+        item.towRecommendRank = currentGroup.rankInIndicator ? `${currentGroup.rankInIndicator}/${currentGroup.groupIndicator}` : '-'
+
       })
       return {
         towGroupIndicator: {
           label: '二次补录剩余计划'
         },
+        towSupplyRankInDisenroll: {
+          label: '二次补录人数排名'
+        },
         towSupplyBestIndicator: {
           label: '二次补录组合成绩最高人数'
         },
         towSupplyRankInBest: {
           label: '二次补录组合成绩最高人数排名'
         },
-        towSupplyRankInDisenroll: {
-          label: '二次补录人数排名'
+        towRecommendRank: {
+          label: '二次补录推荐录取排名'
         }
       }
     }

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

@@ -254,9 +254,9 @@ export default {
     activeModels(){
       if(!this.generation) return {}
       const generation = this.generation.models.find(item => item.generation == this.generation.active)
-      generation.selectedList = generation.models.filter(item => {
-        return item.selected
-      })
+      // generation.selectedList = generation.models.filter(item => {
+      //   return item.selected
+      // })
       return generation
     },
     // 初始化 rows 填充固定数据
@@ -333,7 +333,7 @@ export default {
       }
       this.activeModels.models.find(item =>  item.groupId == row.groupId).selected = true
       row.selected = true
-      // this.activeModels.selectedList.push(row)
+      this.activeModels.selectedList.push(row)
     },
     toUnSelect(row) {
       this.$confirm(`是否解除选科组合【${row.groupName}】`, '警告', {
@@ -342,10 +342,10 @@ export default {
         type: 'warning'
       }).then(() => {
         this.activeModels.models.find(item =>  item.groupId == row.groupId).selected = false
-        // row.selected = false
-        // const start = this.activeModels.selectedList.findIndex(item => item.groupId == row.groupId)
-        // console.log(start)
-        // this.activeModels.selectedList.splice(start, 1)
+        row.selected = false
+        const start = this.activeModels.selectedList.findIndex(item => item.groupId == row.groupId)
+        console.log(start)
+        this.activeModels.selectedList.splice(start, 1)
       }).catch(() => {
         this.$message({
           type: 'info',