选科报名--回显前一轮报名数据、表格列名增加提示

src/assets/styles/common.scss

@@ -714,3 +714,5 @@
 .pd20{
   padding: 20px ;
 }
+
+

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

@@ -45,11 +45,16 @@ export default {
   components:{
     SingleSubjectReport
   },
+  props: {
+    prevPreferences: {
+      type:Array,
+      default: []
+    }
+  },
   data() {
     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"
+      :before-close="handlerClose"
       :close-on-click-modal ="false"
       width="70%"
     >
@@ -29,16 +30,19 @@ export default {
     }
   },
   methods: {
+    handlerClose() {
+      console.log('res')
+      this.cancel()
+    },
     open(course0, course1,year) {
       this.dialogVisible = true
-      this.year = year
+      this.year = year || ''
       this.course0 = course0
       this.course1 = course1
     },
     cancel() {
       this.dialogVisible = false
       this.optionalMajors()
-      this.$emit('chooseReally',)
     }
   }
 }

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

@@ -10,6 +10,29 @@
       </div>
     </template>
     <mx-table :propDefines="formatTable.cols" :rows="formatTable.rows">
+      <template #rankInGroup="{label, key}">
+        <div   class="fx-column" >
+          <span>{{ label }}</span>
+          <el-popover
+            placement="bottom"
+            trigger="click">
+            <span>组合成绩在填报组合的排名</span>
+            <i slot="reference" class="pointer el-icon-question el-icon"></i>
+          </el-popover>
+        </div>
+      </template>
+      <template #rankInGrade="{label, key}">
+        <div   class="fx-column" >
+          <span>{{ label }}</span>
+          <el-popover
+            placement="bottom"
+            trigger="click"
+          >
+            <span>组合成绩在全校的排名</span>
+            <i slot="reference" class="pointer el-icon-question el-icon"></i>
+          </el-popover>
+        </div>
+      </template>
       <template #temp="{row}">
         <span class="btn-blue mr5" @click="toSelectSub(row)">选择</span>
         <span class="btn-green" @click="toReport">查看记录</span>
@@ -71,7 +94,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"></Ai-dialog>
+    <Ai-dialog ref="aiDialog" :prevPreferences="prevPreferences"></Ai-dialog>
   </el-card>
 </template>
 <script>
@@ -103,6 +126,7 @@ export default {
   mixins: [MxSelectTranslate],
   data() {
     return {
+      prevPreferences:[1], // 选科前一轮报名的group
       optionalMajors: [],
       dialogVisible: false,
       modelsWrapper: {},
@@ -162,10 +186,12 @@ export default {
         },
         ...statCols,
         rankInGroup: {
-          label: '当前组合实时排名'
+          label: '当前组合实时排名',
+          slotHeader: 'rankInGroup'
         },
         rankInGrade: {
-          label: '选科全校排名'
+          label: '选科全校排名',
+          slotHeader: 'rankInGrade'
         },
         allowSelectTips: {
           label: '报名状态'