diff --git a/src/utils/api.js b/src/utils/api.js
index 910d7dd..5f32b07 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -347,6 +347,8 @@ export default {
copyExamPaper: `exam/exam/paper/copyExamPaper`,
getDetailedExamScores: `exam/exam/paper/getDetailedExamScores`,
exportExamPaperReport: `exam/exam/paper/exportExamPaperReport`,
+ exportLabReport: `occupationlab/occupationlab/achievement/exportLabReport`,
+ exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`,
// 赛事内容
addCompetitionContent: `competition/competition/content/addCompetitionContent`,
diff --git a/src/views/match/manage/matchArch.vue b/src/views/match/manage/matchArch.vue
index bf79519..8a41f3a 100644
--- a/src/views/match/manage/matchArch.vue
+++ b/src/views/match/manage/matchArch.vue
@@ -29,7 +29,8 @@
成绩统计
- 我的评阅任务
+ 我的评阅任务
分配评阅任务
@@ -122,7 +123,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 ? 'otherArchList' : 'matchArchList'}?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}&showFile=${showFile}`)
+ this.$router.push(`/${cur.method === 2 ? 'otherArchList' : 'matchArchList'}?id=${this.id}&stageId=${row.stageId}&method=${row.method}&competitionType=${row.competitionType}&showFile=${showFile}&showMyReviewTask=${row.showMyReviewTask}`)
},
// 我的评阅任务
showReview (row, path) {
diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue
index a5b64b2..ccb5a14 100644
--- a/src/views/match/manage/matchArchList.vue
+++ b/src/views/match/manage/matchArchList.vue
@@ -80,7 +80,8 @@
分配评阅任务
- 我的评阅任务
+ 我的评阅任务
导出答题文件
{{ exportingList ? '正在导出'
@@ -231,6 +232,7 @@ export default {
stageId: +this.$route.query.stageId,
method: +this.$route.query.method,
competitionType: +this.$route.query.competitionType,
+ showMyReviewTask: +this.$route.query.showMyReviewTask,
isCompress: Util.isCompress,
filter: {
provinceId: '',
diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue
index 4b46fe2..c2d80e3 100644
--- a/src/views/match/manage/matchInfo.vue
+++ b/src/views/match/manage/matchInfo.vue
@@ -347,9 +347,10 @@ export default {
teamId: this.info.teamId
})
this.teamErrors = res.teamTip.split(';').filter(e => e)
-
if (Object.keys(res.stageTip).length) {
this.stageTip = res.stageTip
+ } else {
+ this.stageTip = null
}
},
// 报名时间、比赛时间、状态处理
diff --git a/src/views/match/manage/trialReport.vue b/src/views/match/manage/trialReport.vue
index 66817bb..c18d0b0 100644
--- a/src/views/match/manage/trialReport.vue
+++ b/src/views/match/manage/trialReport.vue
@@ -114,7 +114,7 @@
-
+ {{ scope.row.answer }}
@@ -253,6 +253,10 @@ export default {
padding: 12px 300px 20px;
}
+.pre-code {
+ white-space: pre-wrap;
+}
+
.text-right {
text-align: right;
}