ai分析阶段不迭代数据

src/views/system/user/profile/components/ai-analysis-dialog.vue

@@ -122,17 +122,23 @@ export default {
       const options = this.generation.options
       console.log(this.generation)
       if (!options || !this.generation.active) return {}
-      const optValues = Object.values(options)
+      // const optValues = Object.values(options)
       const dynamicColumns = {}
-      for (let gen = options.primary.value; gen <= this.generation.active; gen++) {
-        const opt = optValues.find(opt => opt.value == gen)
-        const resolverKey = opt.key + 'Resolver'
-        const resolver = this[resolverKey]
-        if (typeof resolver === 'function') {
-          const genColumns = resolver(gen, this.generation.active)
-          Object.assign(dynamicColumns, genColumns)
-        }
+      const resolverKey = this.generation.activeOpt.key + 'Resolver'
+      const resolver = this[resolverKey]
+      if (typeof resolver === 'function') {
+            const genColumns = resolver(this.generation.active)
+            Object.assign(dynamicColumns, genColumns)
       }
+      // for (let gen = options.primary.value; gen <= this.generation.active; gen++) {
+      //   const opt = optValues.find(opt => opt.value == gen)
+      //   const resolverKey = opt.key + 'Resolver'
+      //   const resolver = this[resolverKey]
+      //   if (typeof resolver === 'function') {
+      //     const genColumns = resolver(gen, this.generation.active)
+      //     Object.assign(dynamicColumns, genColumns)
+      //   }
+      // }
       console.log(dynamicColumns)
       return dynamicColumns
     },

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

@@ -2,6 +2,7 @@ export default {
   methods: {
     backTrackingResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen)?.models || []
+      console.log('back',models)
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         const disenrollAll = Math.abs(models.sum(m => m.groupIndicator))

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

@@ -2,30 +2,31 @@ export default {
   methods: {
     finalAdjustResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
+      console.log('final',models)
       this.formatRows.forEach(item => {
         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}/${disenrollAll}` : '-'
-        item.towRecommendRank = currentGroup.rankInIndicator ? `${currentGroup.rankInIndicator}/${currentGroup.groupIndicator}` : '-'
+        item.groupIndicator = currentGroup.groupIndicator
+        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 {
-        towGroupIndicator: {
+        groupIndicator: {
           label: '二次补录计划'
         },
-        towSupplyRankInDisenroll: {
+        supplyRankInDisenroll: {
           label: '二次补录人数总排名'
         },
-        towSupplyBestIndicator: {
+        supplyBestIndicator: {
           label: '二次补录组合成绩最优人数'
         },
-        towSupplyRankInBest: {
+        supplyRankInBest: {
           label: '二次补录组合成绩最优排名'
         },
-        towRecommendRank: {
+        recommendRank: {
           label: '二次补录最优推荐录取排名'
         }
       }

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

@@ -213,7 +213,7 @@ export default {
     currentSupplyInfo() {
       if (!this.generation.models.length) return ''
       // console.log(this.generation)
-      if (this.generation.active < 2) return ''
+      if (this.generation.active < this.generation.options.primaryDM.value) return ''
       let info = ''
       const activeModels = this.generation.models.find(item => item.generation == this.generation.active)
       // 是否被录取？
@@ -262,7 +262,6 @@ export default {
           }
         }
       }
-      console.log(approved)
       return info
     },
     flagShow() {
@@ -406,7 +405,6 @@ export default {
     },
     toAiAnalysis() {
       // AI 分析 跳转
-      console.log(this.formatRows)
       this.$refs.aiDialog.open(this.formatRows)
     },
     commit() {