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

src/views/elective/select/components/elective-ai-report-dialog.vue

@@ -119,8 +119,8 @@ export default {
     },
     section() {
       return {
-        must: this.bestAchieve.rankInDisenroll <= this.bestAchieve.rankInIndicator, // 可以录
-        maybe: this.bestAchieve.rankInBest <= this.bestAchieve.groupIndicator  && this.bestAchieve.rankInDisenroll > this.bestAchieve.rankInIndicator, // 可能录上
+        must: this.bestAchieve.rankInDisenroll <= this.bestAchieve.groupIndicator, // 可以录
+        maybe: this.bestAchieve.rankInBest <= this.bestAchieve.groupIndicator  && this.bestAchieve.rankInDisenroll > this.bestAchieve.groupIndicator, // 可能录上
         other: '', // 录不上,可以报推荐
       }
     },

src/views/elective/select/components/elective-preference-command.vue

@@ -36,6 +36,7 @@ export default {
   },
   methods: {
     async handleCommit() {
+      console.log(this.group)
       if (this.enableCommit) {
         this.$message.error(this.preferenceCount == 1 ? `只能填报1个志愿` : `最多只能填报${this.preferenceCount}个志愿`)
         return
@@ -46,7 +47,7 @@ export default {
         this.selectedList.push(this.group)
       } else {
         let confirmTip = `确认填报 ${this.group.groupName}`
-        if (!group.isRecommend) confirmTip += '（非推荐）'
+        if (!this.group.isRecommend) confirmTip += '（非推荐）'
         await this.$confirm(confirmTip)
         this.group.selected = true
         this.selectedList.push(this.group)