Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

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

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

@@ -1,9 +1,7 @@
 export default {
   methods: {
     backTrackingResolver(gen, active) {
-      console.log(gen)
-      const models = this.generation.activeModels.find(item => item.generation == gen).models
-      console.log(active)
+      const models = this.generation.activeModels.find(item => item.generation == gen)?.models || []
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId)
         console.log(currentGroup)
@@ -12,11 +10,11 @@ export default {
         item.supplyBestIndicator = currentGroup.bestInIndicator || '/'
         item.supplyRankInBest = (!currentGroup.approved && !currentGroup.forceAdjusted)? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '/'
         item.supplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${disenrollAll}` : '/'
+
       })
       return {
         groupIndicator: {
-          label: '超缺',
-          slot: 'underOver'
+          label: '补录剩余计划'
         },
         supplyBestIndicator: {
           label: '补录组合成绩最高人数'

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

@@ -1,32 +1,27 @@
 export default {
   methods: {
-    finalAdjustResolver(gen,active) {
+    finalAdjustResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       this.formatRows.forEach(item => {
-        const currentGroup = models.find(group => group.groupId == item.groupId)
-        console.log(currentGroup)
-        const groupIndicatorAll = models.reduce((prev,current)=> {
-          const groupIndicator = current.groupIndicator >= 0 ? 0 : ( - current.groupIndicator)
-          return prev + groupIndicator
-        },0)
+        const currentGroup = models.find(group => group.groupId == item.groupId) || {}
+        const disenrollAll = Math.abs(models.sum(m => m.groupIndicator))
         item.towGroupIndicator = currentGroup.groupIndicator
-        item.towSupplyBestIndicator = currentGroup.bestInIndicator || '/'
-        item.towSupplyRankInBest = currentGroup.rankInBest ? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '/'
-        item.towSupplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${groupIndicatorAll}`  : '/'
+        item.towSupplyBestIndicator = currentGroup.bestInIndicator || '-'
+        item.towSupplyRankInBest = currentGroup.rankInBest ? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '-'
+        item.towSupplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${disenrollAll}` : '-'
       })
       return {
-        towGroupIndicator:{
-          label:'二次补录超缺',
-          slot:'underOver'
+        towGroupIndicator: {
+          label: '二次补录剩余计划'
         },
-        towSupplyBestIndicator:{
-          label:'二次补录组合成绩最高人数'
+        towSupplyBestIndicator: {
+          label: '二次补录组合成绩最高人数'
         },
-        towSupplyRankInBest:{
-          label:'二次补录组合成绩最高人数排名'
+        towSupplyRankInBest: {
+          label: '二次补录组合成绩最高人数排名'
         },
-        towSupplyRankInDisenroll:{
-          label:'二次补录人数排名'
+        towSupplyRankInDisenroll: {
+          label: '二次补录人数排名'
         }
       }
     }