From f2e3affd102f6cd98448ef70c12ee3ca81afc659 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 04 七月 2024 17:57:01 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/views/exam/exam/MarkPaper.vue | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 4449396..89565ff 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -71,18 +71,12 @@
>
</el-table-column>
<el-table-column
- align="center"
- prop="phone"
- label="绯荤粺鑷姩浼板垎(閫夋嫨棰樺瀷)"
- >
- </el-table-column>
- <el-table-column
label="鎿嶄綔"
align="center"
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 +111,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') {
+ } 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