浏览代码

remove test code

hare8999@163.com 2 年之前
父节点
当前提交
ef7b31ef0a

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

@@ -201,7 +201,8 @@ export default {
         temp: {
           label: '选择专业',
           width: '140',
-          slot: 'temp'
+          slot: 'temp',
+          hidden: this.readonly
         },
         subjects: {
           label: '自选专业',
@@ -249,17 +250,6 @@ export default {
       return this.generation.roundGroups.map(rg => {
         const row = generationModels.find(item => item.groupId == rg.groupId) || {}
         row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名'
-        row.subjects = this.optionalMajors.filter(college => {
-          if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName
-        }).map(item => item.majorCategoryName)
-        row.colleges = this.optionalMajors.filter(college => {
-          if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName
-        }).map(item => {
-          return {
-            college: item.collegeName,
-            major: item.majorCategoryName
-          }
-        })
         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
         return {
           groupId: row.groupId,

+ 1 - 6
src/views/system/user/profile/round-select.vue

@@ -153,12 +153,7 @@ export default {
     loadStudentSelected() {
       getStudentSelected().then(res => {
         console.log('getStudentSelected', res)
-        const selectStatus = res.data.selectResult
-        selectStatus.currentGeneration = 3 // 当前所处的状态
-        selectStatus.preferenceCount = 3 // 志愿数
-        // selectStatus.groupIds = selectStatus.groupIds || '1,2,3,4,5,6'
-        selectStatus.groupIds = '1,2,3,4,5,6'
-        this.selectObj = selectStatus
+        this.selectObj = res.data['selectResult']
         this.allowSelect = res.data.allowSelect
       })
     }