diff --git a/src/views/match/manage/index.vue b/src/views/match/manage/index.vue index 8050d95..cc2559f 100644 --- a/src/views/match/manage/index.vue +++ b/src/views/match/manage/index.vue @@ -58,7 +58,7 @@ export default { if (Setting.dynamicRoute) { this.initTabs() } else { - this.active = 'tab1' + this.active = this.$route.query.tab || 'tab1' } }, methods: { @@ -121,7 +121,7 @@ export default { // tab切换 tabSwitch (i) { this.active = i - this.$router.push(`/matchManage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`) + this.$router.push(`/matchManage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`).catch(e => { }) }, // 判断返回还是tab backOrTab (i) { diff --git a/src/views/match/manage/matchArch.vue b/src/views/match/manage/matchArch.vue index 66cc1c6..0daa14f 100644 --- a/src/views/match/manage/matchArch.vue +++ b/src/views/match/manage/matchArch.vue @@ -101,7 +101,7 @@ export default { this.$store.commit('setInnerReferrer', this.$route.fullPath) const cur = this.form.competitionStage[i] const showFile = !!(cur.method === 2 && cur.competitionStageContentSetting && cur.competitionStageContentSetting.whetherToUploadFiles) - this.$router.push(`/${cur.method === 2 ? 'matchArchList' : 'theoryArchList'}?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}&showFile=${showFile}`) + this.$router.push(`/${cur.method !== 1 ? 'matchArchList' : 'theoryArchList'}?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}&showFile=${showFile}`) } } }; diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue index 12aa69f..344bd01 100644 --- a/src/views/match/manage/matchArchList.vue +++ b/src/views/match/manage/matchArchList.vue @@ -284,7 +284,7 @@ export default { }, // 查看成绩报告 show (row) { - this.$router.push(`/${row.paperId ? 'theoryReport' : 'trialReport'}?reportId=${row.reportId}`) + this.$router.push(`/trialReport?reportId=${row.reportId}`) }, // 导出(有勾选:就导勾选中的;没有勾选:就导全部) async exportData () { diff --git a/src/views/match/manage/theoryArchList.vue b/src/views/match/manage/theoryArchList.vue index 230cb58..48fdd38 100644 --- a/src/views/match/manage/theoryArchList.vue +++ b/src/views/match/manage/theoryArchList.vue @@ -237,7 +237,7 @@ export default { }, // 查看成绩报告 show (row) { - this.$router.push(`/${row.paperId ? 'theoryReport' : 'trialReport'}?reportId=${row.reportId}`) + this.$router.push(`/theoryReport?reportId=${row.reportId}`) }, // 导出(有勾选:就导勾选中的;没有勾选:就导全部) async exportData () {