ai分析学生报告完善

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

@@ -3,6 +3,7 @@
     v-if="dialogVisible"
     title="AI分析"
     :visible.sync="dialogVisible"
+    :close-on-click-modal ="false"
     width="80%"
   >
     <p class="mb10 fx-row jc-between">当前Generation   {{current}} <el-button type="primary">整体报告</el-button></p>
@@ -34,7 +35,7 @@
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
-    <single-subject-report :reportInfo="tableInfo.rows" :currentGroup="currentReportName" ref="SingleSubjectReport"></single-subject-report>
+    <single-subject-report :prevPreferences="prevPreferences"  :reportInfo="tableInfo.rows" :currentGroup="currentReportName" ref="SingleSubjectReport"></single-subject-report>
   </el-dialog>
 </template>
 <script>
@@ -48,6 +49,7 @@ export default {
     return{
       dialogVisible:false,
       tableInfo: {},
+      prevPreferences:[1], // 选科前一轮报名的group
       currentReportName: '',
       current: ''
     }

src/views/system/user/profile/components/choose-subject-dialog.vue

@@ -4,6 +4,7 @@
       v-if="dialogVisible"
       title="选择自选专业"
       :visible.sync="dialogVisible"
+      :close-on-click-modal ="false"
       width="70%"
     >
       <subject-choice :course0="course0" :course1="course1" :year="year" ></subject-choice>

src/views/system/user/profile/components/single-subject-report.vue

@@ -9,13 +9,11 @@
     <div v-if="Object.keys(reportInfo).length > 0">
       <p>点评：</p>
       <div class="mt10 mb10">
-        <p>1,学校现在所开设的六种科目,<span :class="isCanSignFlag.allowSelect ? 'f-primary': 'f-red'">{{
-            isCanSignFlag.groupName
-          }}</span>
-          您
-          <span :class="isCanSignFlag.allowSelect ? 'f-primary': 'f-red'">
-          {{ isCanSignFlag.allowSelect ? '符合' : '不符合' }}
-          </span>条件,现有
+        <p>1,学校现在所开设的六种科目,
+          <span  class="f-red">
+            {{tipsModel.admissionInfo}}
+          </span>,
+          现有
           <span class="f-primary">
             {{ canSign.map(item => item.groupName).join(',') }}
           </span>您可以报名
@@ -42,7 +40,7 @@
         <p class="mb10">4,三科录取分析：</p>
         <div v-for="(item,index) in canSign" class="mb10">
           <p>{{item.groupName}} : 成绩{{item.scoreSumGroup}}<span class="f-primary" v-if="index == 0"> (补录成绩最优组合)</span> </p>
-          <p>在补录学生{{countNumber}}人中该组合成绩最优学生有{{item.bestInIndicator}}人,该组合计划人数为{{item.groupIndicator}}
+          <p>在补录学生{{tipsModel.countNumber}}人中该组合成绩最优学生有{{item.bestInIndicator}}人,该组合计划人数为{{item.groupIndicator}}
             您在该<span v-if="index == 0">最优</span>组合中排名{{ item.rankInBest }},您可以被该组合录取。您的成绩符合该组合。<span v-if="item.colleges.length == 0">（自选专业不符合）</span>
             <span v-if="index == 0">按照成绩优先原则,系统推荐您报该组合。</span>
             <span v-else>您如果不填写系统推荐您的最优组合,您也可以报该组合。</span>
@@ -56,8 +54,15 @@
   </el-dialog>
 </template>
 <script>
+import MxSelectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin.js'
+
 export default {
+  mixins:[MxSelectTranslateMixin],
   props: {
+    prevPreferences: {
+      type:Array,
+      default: []
+    },
     reportInfo: {
       type: Array,
       default: {}
@@ -68,10 +73,19 @@ export default {
     }
   },
   computed: {
-    countNumber(){
-      return this.canSign.reduce((prev,cur)=>{
+    tipsModel(){
+      if(!this.prevPreferences.length) return {}
+      const countNumber = this.canSign.reduce((prev,cur)=>{
          return prev + cur.groupIndicator
       },0)
+      const str = this.prevPreferences.map(item=>{
+        return this.translateGroup(item)
+      }).join('、')
+      const admissionInfo = `${str}您不符合条件`
+      return {
+        countNumber,
+        admissionInfo
+      }
     },
     isCanSignFlag() {
       // 传入的组合是否能报名