ai分析提示

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

@@ -58,7 +58,7 @@
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
-    <single-subject-report :prevPreferences="prevPreferences"  :reportInfo="formatRows"  ref="SingleSubjectReport"></single-subject-report>
+    <single-subject-report :admissionInfo="prevPreferencesInfo"  :reportInfo="formatRows"  ref="SingleSubjectReport"></single-subject-report>
   </el-dialog>
 </template>
 <script>
@@ -72,7 +72,8 @@ export default {
     OverUnderBadge
   },
   props: {
-    generation: Object
+    generation: Object,
+    prevPreferencesInfo: String,
   },
   mixins: [BackTrackingAiResolverMixins,FinalAdjustAiResolverMixins],
   data() {
@@ -80,7 +81,6 @@ export default {
       dialogVisible:false,
       formatRows: [],
       tableInfo: {},
-      prevPreferences: [1], // 选科前一轮报名的group
       currentReportName: '',
     }
   },

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

@@ -117,7 +117,7 @@
     <esign-dialog ref="esignDialog"></esign-dialog>
     <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>
     <select-subject-report-dialog ref="reportDialog"></select-subject-report-dialog>
-    <Ai-dialog ref="aiDialog" :generation="generation"></Ai-dialog>
+    <Ai-dialog ref="aiDialog" :prevPreferencesInfo="currentSupplyInfo" :generation="generation"></Ai-dialog>
   </div>
 </template>
 <script>

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

@@ -13,15 +13,13 @@
       <div v-if="Object.keys(reportInfo).length > 0">
         <p>点评：</p>
         <div class="mt10 mb10">
-          <p>1,学校现在所开设的六种科目,
-            <span  class="f-red">
-            {{tipsModel.admissionInfo}}
-          </span>,
-            现有
-            <span class="f-primary">
-            {{ canSign.map(item => item.groupName).join(',') }}
-          </span>您可以报名
-          </p>
+          <div class="fx-row" style="align-items: center">1,
+            <p v-html="admissionInfo.slice(0,admissionInfo.lastIndexOf('，'))"></p>
+            <span>,学校现在所开设的六种科目,</span> 现有
+              <span class="f-primary">
+              {{ canSign.map(item => item.groupName).join(',') }}
+            </span>您可以报名
+          </div>
         </div>
         <div class="mb10">
           <p>2,专业符合情况：</p>
@@ -72,9 +70,9 @@ export default {
   name: 'subject-report',
   mixins:[MxSelectTranslateMixin],
   props: {
-    prevPreferences: {
-      type:Array,
-      default: []
+    admissionInfo: {
+      type:String,
+      default: ''
     },
     reportInfo: {
       type: Array,
@@ -83,17 +81,12 @@ export default {
   },
   computed: {
     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() {