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 | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 7c68b67..89565ff 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -71,12 +71,6 @@
>
</el-table-column>
<el-table-column
- align="center"
- prop="phone"
- label="绯荤粺鑷姩浼板垎(閫夋嫨棰樺瀷)"
- >
- </el-table-column>
- <el-table-column
label="鎿嶄綔"
align="center"
width="300px"
@@ -117,10 +111,10 @@
}
},
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 '鏈畬鎴�'
}
},
--
Gitblit v1.8.0