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

src/common/mx-const.js

@@ -69,6 +69,12 @@ export default {
       philosophy: 1,  // 人生价值观
       occupation: 2,  // 职业兴趣
       knowledge: 3    // 知识兴趣
+    },
+    electivePermission: {
+      studentApplyCount: 'elective:student:apply:applyCount', //初录选科人数比 elective:student:apply:scoreByGroup
+      scoreByGroup: 'elective:student:apply:scoreByGroup', // 组合成绩
+      rankInGroup: 'elective:student:apply:rankInGroup', // 当前组合实时排名
+      rankInGrade: 'elective:student:apply:rankInGrade', // 当前组合全校排名
     }
   }
 }

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

@@ -323,7 +323,7 @@ export default {
 
       return {
         rankInGroup: {
-          label: '当前组合实时排名'
+          label: '当前组合实时排名',
         },
         rankInGrade: {
           label: '选科全校排名'

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

@@ -1,4 +1,10 @@
+import { mapGetters } from 'vuex'
+import consts from '@/common/mx-const'
+
 export default {
+  computed: {
+    ...mapGetters(['hasPermissions'])
+  },
   methods: {
     backTrackingResolver(gen, active,context) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
@@ -11,6 +17,7 @@ export default {
         return {
           backTrackingApply: {
             label: '补录报名情况',
+            hidden: this.hasPermissions([consts.enum.electivePermission.studentApplyCount])
           }
         }
       } else {

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

@@ -35,6 +35,7 @@
       <template #header>选科报告</template>
       <el-button v-if="false" @click="goReportDemo">选科报告1</el-button>
       <el-button @click="goReportDemoOnline">选科报告</el-button>
+      <el-button @click="goStudyReportDemoOnline">学情报告</el-button>
     </el-card>
 
     <el-dialog :visible.sync="helpVideo.visible">
@@ -207,6 +208,10 @@ export default {
     goReportDemoOnline() {
       const path = 'https://online.fliphtml5.com/jkrou/ybov/'
       window.open(path)
+    },
+    goStudyReportDemoOnline() {
+      const path = 'https://online.fliphtml5.com/jkrou/hjig/'
+      window.open(path)
     }
   }
 }