From b17c2ddebcfaeaa48edc1eeca5ee0dc03d9fde90 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 七月 2024 09:25:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/exam/exam/MarkPaper.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 3e8e8ac..657ee0f 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -82,7 +82,7 @@
width="300px"
>
<template slot-scope="scope">
- <el-button @click="markPaper(scope.row)" type="warning">闃呭嵎</el-button>
+ <el-button @click="markPaper(scope.row.userId)" type="warning">闃呭嵎</el-button>
</template>
</el-table-column>
</el-table>
@@ -117,15 +117,16 @@
}
},
methods: {
- statusFormatter(row) {
- if (row.status === 'finish' || row.markPaperStatus === 'finish') {
+ statusFormatter (row, column, cellValue, index) {
+ if (cellValue === 'finish') {
return '瀹屾垚'
- } else if (row.status === 'temp' || row.markPaperStatus === 'temp') {
- return "鏈畬鎴�"
+ } else if (cellValue === 'temp') {
+ return '鏈畬鎴�'
}
},
- markPaper (row) {
+ markPaper (userId) {
// todo鎵撳紑闃呭嵎椤甸潰
+ this.$router.push({path: "/exam/mark/paper/detail", query: {examId: this.examInfo.examId, examName: this.examInfo.examName, userId: userId}})
},
getExamInfo () {
getExamMarkPaperInfo(this.examInfo.examId).then(res => {
--
Gitblit v1.8.0