From 4d8f0c85660d7dd77199e86e9af9e945a1611e52 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 七月 2024 09:41:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/exam/exam/MarkPaper.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 560799d..89565ff 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -58,8 +58,16 @@
</el-table-column>
<el-table-column
align="center"
- prop="phone"
- label="绯荤粺鑷姩浼板垎(閫夋嫨棰樺瀷)"
+ prop="status"
+ :formatter="statusFormatter"
+ label="鎻愪氦鐘舵��"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="markPaperStatus"
+ :formatter="statusFormatter"
+ label="闃呭嵎鐘舵��"
>
</el-table-column>
<el-table-column
@@ -68,7 +76,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>
@@ -103,8 +111,16 @@
}
},
methods: {
- markPaper (row) {
+ statusFormatter (row, column, cellValue, index) {
+ if (cellValue === 'finish') {
+ return '瀹屾垚'
+ } else if (cellValue === 'temp') {
+ return '鏈畬鎴�'
+ }
+ },
+ 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