yujialong 1 month ago
parent b692519c5d
commit df33b0b5eb
  1. 2
      src/utils/api.js
  2. 5
      src/views/match/manage/matchArch.vue
  3. 4
      src/views/match/manage/matchArchList.vue
  4. 3
      src/views/match/manage/matchInfo.vue
  5. 6
      src/views/match/manage/trialReport.vue

@ -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`,

@ -29,7 +29,8 @@
<el-button type="text" @click="toArch(scope.row, scope.$index)">成绩统计</el-button>
<!-- <el-button @click="toArch(scope.row, scope.$index)">编辑试卷</el-button> -->
<template v-if="scope.row.method === 1">
<el-button type="text" @click="showReview(scope.row, '/myReview/records')">我的评阅任务</el-button>
<el-button v-if="scope.row.showMyReviewTask" type="text"
@click="showReview(scope.row, '/myReview/records')">我的评阅任务</el-button>
<el-button v-auth="'/review:分配评阅任务'" type="text"
@click="showReview(scope.row, '/allocationReview/records')">分配评阅任务</el-button>
</template>
@ -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) {

@ -80,7 +80,8 @@
<template v-if="active && method === 1">
<el-button v-auth="'/review:分配评阅任务'" type="primary" size="mini"
@click="showReview('/allocationReview/records')">分配评阅任务</el-button>
<el-button type="primary" size="mini" @click="showReview('/myReview/records')">我的评阅任务</el-button>
<el-button v-if="showMyReviewTask" type="primary" size="mini"
@click="showReview('/myReview/records')">我的评阅任务</el-button>
<el-button type="primary" size="mini" @click="exportFiles">导出答题文件</el-button>
</template>
<el-button type="primary" size="mini" :loading="exportingList" @click="exportList">{{ 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: '',

@ -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
}
},
//

@ -114,7 +114,7 @@
</span>
</div>
</div>
<div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
<div v-else class="pre-code">{{ scope.row.answer }}</div>
<template v-if="scope.row.runThePictureList">
<img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic"
:src="img" alt="">
@ -253,6 +253,10 @@ export default {
padding: 12px 300px 20px;
}
.pre-code {
white-space: pre-wrap;
}
.text-right {
text-align: right;
}

Loading…
Cancel
Save