ai分析调整

src/views/career/bigdataSelectCourse/report.vue

@@ -10,14 +10,14 @@
       <template v-if="index <= allResult.findIndex(item => item.isEnroll)">
         <!-- 已录取 -->
         <div v-if="result.isEnroll">
-          您在{{ result.name }}时报选了<span class="f-primary">{{result.groupList.map(item=> item.groupName).toString(',')}}</span>组合
-          您在{{result.name}}阶段被 <span class="f-primary">{{result.groupList.filter(item => item.approved).map(item=> item.groupName).toString(',')}}</span>组合录取
+          <span>您在{{ result.name }}时报选了</span><span class="f-primary"> {{result.groupList.map(item=> item.groupName).toString(',')}} </span>组合
+          您在{{result.name}}阶段被 <span class="f-primary"> {{result.groupList.filter(item => item.approved).map(item=> item.groupName).toString(',')}} </span>组合录取
         </div>
         <!--    未录取   -->
         <div v-else>
           <div>
-            您在{{ result.name }}时报选了<span class="f-red">{{result.groupList.map(item=> item.groupName).toString(',')}}</span> 组合
-            ，您在{{ result.name }}未被 <span class="f-red">{{result.groupList.map(item=> item.groupName).toString(',')}}</span> 组合录取
+            您在{{ result.name }}时报选了<span class="f-red"> {{result.groupList.map(item=> item.groupName).toString(',')}} </span> 组合
+            ，您在{{ result.name }}未被 <span class="f-red"> {{result.groupList.map(item=> item.groupName).toString(',')}} </span> 组合录取
           </div>
           <div>
             您在{{result.name}}未被录取,系统推荐您选报 <span class="f-primary">{{result.model.find(item => item.nextRecommend) ?  result.model.find(item => item.nextRecommend).groupName : ''}}</span> 组合

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

@@ -10,14 +10,21 @@
       <div class="mb10" >
         <p class="mb5">1，报名情况：</p>
           <span v-if="approved">恭喜</span>
-          <span>
+          <span  v-if="!appliedModel.selectedList.length">
+            <span>您在{{subTitle(appliedModel.option.title)}}阶段未填报，</span>
+          </span>
+          <span  v-else-if="appliedModel.selectedList.some(m=>m.rejected)">
+            <span>您在{{subTitle(appliedModel.option.title)}}阶段拒绝填报了</span>
+            <span class="f-red"> {{apply.toString(',')}} </span>组合，
+          </span>
+          <span v-else>
             <span>您在{{subTitle(appliedModel.option.title)}}阶段填报的</span>
             <span :class="approved ? 'f-primary': 'f-red'"> {{apply.toString(',')}}组合 </span>
             <span  v-if="approved">已被录取</span>
             <span v-else>未被录取</span>,
           </span>
-          <span>学校现在所开设的{{activeModel.models.length}}种科目,现有 <span class="f-primary">{{ canSign.map(item => item.groupName).join(',') }}  {{canSign.length}}个科目缺额,</span> </span>
-          <span>系统推荐您 <span class="f-primary">{{activeModel.models.find(item => item.isRecommend).groupName}}科目</span> 组合</span>
+          <span>学校现在所开设的{{activeModel.models.length}}种科目,现有 <span class="f-primary">{{ canSign.map(item => item.groupName).join(',') }} </span> {{canSign.length}}个科目缺额, </span>
+          <span>系统推荐您 <span class="f-primary">{{activeModel.models.find(item => item.isRecommend).groupName}}</span> 科目组合</span>
       </div>
       <div>
         <div class="mb10">
@@ -52,15 +59,15 @@
           <p v-for="item in canSign">{{item.groupName}} <span class="f-red">{{item.bestInIndicator}}</span> 人</p>
           <p class="f-red">
             您在{{canSign.length}}个缺额组合中{{bestAchieve.groupName}}成绩最优组合{{ bestAchieve.scoreSumGroup }}分，
-            在该组合最优人数{{ bestAchieve.bestInIndicator }}人中，排名第{{bestAchieve.rankInIndicator}}名，
-            全校排名{{bestAchieve.rankInDisenroll}}名，计划数为{{bestAchieve.groupIndicator}}人
-            <span v-if="bestAchieve.rankInIndicator <= bestAchieve.groupIndicator && bestAchieve.rankInDisenroll<= bestAchieve.rankInIndicator">
+            在该组合最优人数{{ bestAchieve.bestInIndicator }}人中，排名第{{bestAchieve.rankInBest}}名，
+            全校排名第{{bestAchieve.rankInDisenroll}}名，计划数为{{bestAchieve.groupIndicator}}人
+            <span v-if="section.must">
               ，您可以被该组合录取。
             </span>
-            <span v-else-if="bestAchieve.rankInIndicator <= bestAchieve.groupIndicator  && bestAchieve.rankInDisenroll > bestAchieve.rankInIndicator">
+            <span v-else-if="section.maybe">
               ，如果没有其他学生在该组合全校排名比您高且填报该组合，您可以被该组合录取。
             </span>
-            <span v-else-if="bestAchieve.rankInIndicator > bestAchieve.groupIndicator  && bestAchieve.rankInDisenroll > bestAchieve.rankInIndicator">
+            <span v-else>
               ，所以您不能被成绩最优组合{{bestAchieve.groupName}}录取，系统推荐您报名{{recommend}}组合
             </span>
           </p>
@@ -76,11 +83,11 @@
 import MxSelectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin.js'
 import ElectiveEnrollInfo from '@/views/elective/select/components/elective-enroll-info'
 import ElectiveToolsMixin from '@/views/elective/select/components/elective-tools-mixins'
-import ElectiveTableMixin from '@/views/elective/select/components/elective-table-mixins'
+// import ElectiveTableMixin from '@/views/elective/select/components/elective-table-mixins'
 
 export default {
   name: 'elective-ai-report-dialog',
-  mixins: [MxSelectTranslateMixin, ElectiveToolsMixin,ElectiveTableMixin,ElectiveEnrollInfo],
+  mixins: [MxSelectTranslateMixin, ElectiveToolsMixin,ElectiveEnrollInfo],
   props: {
     generation: {
       type: Object,
@@ -106,19 +113,17 @@ export default {
       if (!this.generation) return {}
       return this.generation.activeModel
     },
-    tipsModel() {
-      const countNumber = this.canSign.reduce((prev, cur) => {
-        return prev + cur.groupIndicator
-      }, 0)
-
-      return {
-        countNumber
-      }
-    },
     // 成绩最优
     bestAchieve(){
       return this.canSign[0]
     },
+    section() {
+      return {
+        must: this.bestAchieve.rankInDisenroll <= this.bestAchieve.rankInIndicator, // 可以录
+        maybe: this.bestAchieve.rankInBest <= this.bestAchieve.groupIndicator  && this.bestAchieve.rankInDisenroll > this.bestAchieve.rankInIndicator, // 可能录上
+        other: '', // 录不上,可以报推荐
+      }
+    },
     canSign() {
       // if (!this.reportInfo.length) return []
       return this.activeModel.models.filter(item => {