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

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

@@ -9,6 +9,9 @@
     <p class="mb10"><el-button type="primary">整体报告</el-button></p>
 
     <mx-table :propDefines="propDefines" :rows="formatRows">
+      <template #underOver="{value}">
+        <over-under-badge :value="value"></over-under-badge>
+      </template>
       <template #subjects="{row}">
         <el-row>
           <el-col :span="8" v-for="subject in row.subjects">
@@ -35,25 +38,29 @@
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
-<!--    <single-subject-report :prevPreferences="prevPreferences"  :reportInfo="tableInfo.rows" :currentGroup="currentReportName" ref="SingleSubjectReport"></single-subject-report>-->
+    <single-subject-report :prevPreferences="prevPreferences"  :reportInfo="formatRows" :currentGroup="currentReportName" ref="SingleSubjectReport"></single-subject-report>
   </el-dialog>
 </template>
 <script>
 import SingleSubjectReport from './single-subject-report'
+import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 import BackTrackingAiResolverMixins from './ai-round-select-resolvers/backTracking-ai-resolver-mixins'
+import FinalAdjustAiResolverMixins from './ai-round-select-resolvers/finalAdjust-ai-resolver-mixins'
 export default {
   components:{
-    SingleSubjectReport
+    SingleSubjectReport,
+    OverUnderBadge
   },
   props: {
     generation: Object
   },
-  mixins: [BackTrackingAiResolverMixins],
+  mixins: [BackTrackingAiResolverMixins,FinalAdjustAiResolverMixins],
   data() {
     return{
       dialogVisible:false,
       formatRows: [],
       tableInfo: {},
+      prevPreferences: [1], // 选科前一轮报名的group
       currentReportName: '',
     }
   },

src/views/system/user/profile/components/ai-round-select-resolvers/backTracking-ai-resolver-mixins.js

@@ -8,8 +8,8 @@ export default {
         const currentGroup = models.find(group => group.groupId == item.groupId)
         console.log(currentGroup)
         const groupIndicatorAll = models.reduce((prev,current)=> {
-          const groupIndicator = currentGroup.groupIndicator >= 0 ? currentGroup.groupIndicator :  0
-          return prev +current.groupIndicator
+          const groupIndicator = current.groupIndicator >= 0 ? 0 : ( - current.groupIndicator)
+          return prev + groupIndicator
         },0)
         item.groupIndicator = currentGroup.groupIndicator
         item.supplyBestIndicator = currentGroup.bestInIndicator || '/'
@@ -18,7 +18,8 @@ export default {
       })
   return {
         groupIndicator:{
-          label:'超缺'
+          label:'超缺',
+          slot:'underOver'
         },
         supplyBestIndicator:{
           label:'补录组合成绩最高人数'

src/views/system/user/profile/components/ai-round-select-resolvers/finalAdjust-ai-resolver-mixins.js

@@ -0,0 +1,34 @@
+export default {
+  methods: {
+    finalAdjustResolver(gen,active) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      this.formatRows.forEach(item => {
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+        console.log(currentGroup)
+        const groupIndicatorAll = models.reduce((prev,current)=> {
+          const groupIndicator = current.groupIndicator >= 0 ? 0 : ( - current.groupIndicator)
+          return prev + groupIndicator
+        },0)
+        item.towGroupIndicator = currentGroup.groupIndicator
+        item.towSupplyBestIndicator = currentGroup.bestInIndicator || '/'
+        item.towSupplyRankInBest = currentGroup.rankInBest ? `${currentGroup.rankInBest}/${currentGroup.bestInIndicator}` : '/'
+        item.towSupplyRankInDisenroll = currentGroup.rankInDisenroll ? `${currentGroup.rankInDisenroll}/${groupIndicatorAll}`  : '/'
+      })
+      return {
+        towGroupIndicator:{
+          label:'二次补录超缺',
+          slot:'underOver'
+        },
+        towSupplyBestIndicator:{
+          label:'二次补录组合成绩最高人数'
+        },
+        towSupplyRankInBest:{
+          label:'二次补录组合成绩最高人数排名'
+        },
+        towSupplyRankInDisenroll:{
+          label:'二次补录人数排名'
+        }
+      }
+    }
+  }
+}

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

@@ -95,7 +95,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" :prevPreferences="prevPreferences"></Ai-dialog>
+    <Ai-dialog ref="aiDialog" :generation="generation" ></Ai-dialog>
   </div>
 </template>
 <script>
@@ -154,7 +154,6 @@ export default {
       popoShow: false,
       activeStep: '',
       regInfo: '',
-      prevPreferences: [1], // 选科前一轮报名的group
       dialogVisible: false,
       selectedList: [],
       singleList: [], // 单志愿列表