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

# Conflicts:
#	src/views/system/user/profile/components/report-table.vue
#	src/views/system/user/profile/components/round-select-resolvers/backTracking-resolver-mixins.js

src/router/index.js

@@ -783,7 +783,7 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/elective/report/index'], resolve),
         name: 'ElectiveReportIndex',
         meta: {
-          title: '报告示例'
+          title: '选科报告'
         }
       }
     ]

src/views/elective/report/index.vue

@@ -13,12 +13,32 @@ export default {
   data() {
     return {
       images: [null,
-        require('@/assets/images/report_demo/demo_report_a.png'),
-        require('@/assets/images/report_demo/demo_report_b.png'),
-        require('@/assets/images/report_demo/demo_report_c.png'),
-        require('@/assets/images/report_demo/demo_report_d.png'),
-        require('@/assets/images/report_demo/demo_report_e.png'),
-        require('@/assets/images/report_demo/demo_report_f.png')
+        require('@/assets/images/report_demo/副本选科报告_01.png'),
+        require('@/assets/images/report_demo/副本选科报告_02.png'),
+        require('@/assets/images/report_demo/副本选科报告_03.png'),
+        require('@/assets/images/report_demo/副本选科报告_04.png'),
+        require('@/assets/images/report_demo/副本选科报告_05.png'),
+        require('@/assets/images/report_demo/副本选科报告_06.png'),
+        require('@/assets/images/report_demo/副本选科报告_07.png'),
+        require('@/assets/images/report_demo/副本选科报告_08.png'),
+        require('@/assets/images/report_demo/副本选科报告_09.png'),
+        require('@/assets/images/report_demo/副本选科报告_10.png'),
+        require('@/assets/images/report_demo/副本选科报告_11.png'),
+        require('@/assets/images/report_demo/副本选科报告_12.png'),
+        require('@/assets/images/report_demo/副本选科报告_13.png'),
+        require('@/assets/images/report_demo/副本选科报告_14.png'),
+        require('@/assets/images/report_demo/副本选科报告_15.png'),
+        require('@/assets/images/report_demo/副本选科报告_16.png'),
+        require('@/assets/images/report_demo/副本选科报告_17.png'),
+        require('@/assets/images/report_demo/副本选科报告_18.png'),
+        require('@/assets/images/report_demo/副本选科报告_19.png'),
+        require('@/assets/images/report_demo/副本选科报告_20.png'),
+        require('@/assets/images/report_demo/副本选科报告_21.png'),
+        require('@/assets/images/report_demo/副本选科报告_22.png'),
+        require('@/assets/images/report_demo/副本选科报告_23.png'),
+        require('@/assets/images/report_demo/副本选科报告_24.png'),
+        require('@/assets/images/report_demo/副本选科报告_25.png'),
+        require('@/assets/images/report_demo/副本选科报告_26.png')
       ]
     }
   }
@@ -27,8 +47,8 @@ export default {
 
 <style scoped>
 .flip-class {
-  width: 1100px;
-  height: 550px;
+  width: 100%;
+  height: 750px;
   background-color: #999999;
   padding: 20px 0;
 }

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

@@ -107,7 +107,11 @@
           trigger="click"
         >
           <div>
+<<<<<<< HEAD
 <!--            确定拒绝<span class="f-primary">{{recommendGroup.groupName}}</span>组合么？-->
+=======
+            确定拒绝系统给您推荐的<span class="f-primary">{{ recommendGroup.groupName }}</span>组合么？
+>>>>>>> af3b3695b30458144db5aca329945f14507a6a92
             <el-input
               type="textarea"
               :rows="4"
@@ -301,7 +305,14 @@ export default {
       const stepMatched = this.generation.active == this.generation.current
       const enableApply = !this.generation.currentOpt.decisionMaking
       const enableSignUp = stepMatched && enableApply && !this.readonly
+
       return {
+        rankInGroup: {
+          label: '当前组合实时排名'
+        },
+        rankInGrade: {
+          label: '选科全校排名'
+        },
         allowSelectTips: {
           label: '报名状态'
         },
@@ -376,8 +387,6 @@ export default {
         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
         row.colleges = matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))
         row.subjects = matchedMajors.map(m => m['majorCategoryName'])
-        // this.$set(row,'colleges',matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })))
-        // this.$set(row,'subjects',matchedMajors.map(m => m['majorCategoryName']))
         return row
       })
     },
@@ -516,7 +525,7 @@ export default {
       this.$refs.chooseDialog.open(course0, course1)
     },
     async handleRejectRecommend() {
-      if(!this.regInfo.length) {
+      if (!this.regInfo.length) {
         this.$message.error('拒绝原因不能为空')
         return
       }
@@ -526,7 +535,7 @@ export default {
       rejectRecommend({
         models: rejectRow
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.refreshData()
         }
       }).finally(_ => {

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

@@ -7,21 +7,18 @@ export default {
       console.log('context',context)
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
+
         // item.backTrackingApply = `${currentGroup.actualCount + currentGroup.groupApprovedCount} /${currentGroup.personCount}`
         item.rankInGroup = currentGroup.rankInGroup
         item.rankInGrade = currentGroup.rankInGrade
+
+        item.backTrackingApply = `${currentGroup.actualCount} /${currentGroup.groupIndicator}`
       })
 
       if (active < 4) {
         return {
-          // backTrackingApply: {
-          //   label: '补录情况',
-          // },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
+          backTrackingApply: {
+            label: '补录报名情况',
           }
         }
       } else {

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

@@ -6,10 +6,9 @@ export default {
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-        console.log(currentGroup.groupApprovedCount)
-        console.log(currentGroup.groupIndicator)
         item.supplyIndicator = currentGroup.nextGroupIndicator
         // 录取人数加指标/ 设置人数
+        item.backTrackingApply = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
         item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
       })
 

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

@@ -5,25 +5,14 @@ export default {
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
-        // item.applyCount = `${item.actualCount}/${item.personCount}`
-        // item.rankInGroup = item.rankInGroup
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-
         item.applyCount = `${currentGroup.actualCount} /${currentGroup.personCount}`
-        item.rankInGroup = currentGroup.rankInGroup
-        item.rankInGrade = currentGroup.rankInGrade
       })
 
       if(active < 4){
         return {
           applyCount:{
             label:'选科人数比'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
           }
         }
       }else {

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

@@ -1,32 +1,19 @@
 export default {
   methods: {
     primaryDMResolver(gen, active, context) {
-      console.log('context',context)
-      delete context['rankInGroup']
-      delete context['rankInGrade']
-      console.log('context',context)
-
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.primarySituation = currentGroup.nextGroupIndicator
-        item.rankInGroup = currentGroup.rankInGroup
-        item.rankInGrade = currentGroup.rankInGrade
       })
-      console.log(active)
+
       if (active < 4) {
         return {
           primarySituation: {
             label: '超/缺',
             slot: 'underOver'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
           }
         }
       } else {

src/views/system/user/profile/round-select.vue

@@ -36,8 +36,9 @@
       <evaluation-empty v-else :shadow="false" :title="emptyTitle"></evaluation-empty>
     </el-card>
     <el-card shadow="hover" class="mt20">
-      <template #header>选科通知</template>
-      <el-button @click="goReportDemo">报告示例</el-button>
+      <template #header>选科报告</template>
+      <el-button v-if="false" @click="goReportDemo">报告示例</el-button>
+      <el-button @click="goReportDemoOnline">报告示例</el-button>
     </el-card>
 
     <el-dialog :visible.sync="helpVideo.visible">
@@ -205,6 +206,10 @@ export default {
     goReportDemo() {
       const path = '/elective/report/index'
       this.transferTo(path)
+    },
+    goReportDemoOnline() {
+      const path = 'https://online.fliphtml5.com/jkrou/ybov/'
+      window.open(path)
     }
   }
 }