From 2a001b84b32b648e24e4c248442133219ceb8efb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/MarkPaper.vue | 21 +++++++++++++++++++++
src/views/exam/exam/ExamManage.vue | 14 ++++++++------
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index 87e9bfd..468b739 100644
--- a/src/views/exam/exam/ExamManage.vue
+++ b/src/views/exam/exam/ExamManage.vue
@@ -73,7 +73,7 @@
>淇敼
</el-button>
<el-button type="danger" size="small" @click="deleteExam(scope.row.id)">鍒犻櫎</el-button>
- <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
+ <el-button type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
</template>
</el-table-column>
</el-table>
@@ -111,7 +111,8 @@
<el-form-item label="寮�濮嬫椂闂�" :label-width="formLabelWidth" prop="time">
<el-date-picker
v-model="examForm.time"
- type="daterange"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -150,8 +151,8 @@
examPaperType: null,
examPlace: '',
status: '',
- startTime: '',
- endTime: '',
+ startTime: null,
+ endTime: null,
time: []
},
examRules: {
@@ -272,8 +273,9 @@
examPaperType: '',
examPlace: '',
status: '',
- startTime: '',
- endTime: '',
+ startTime: null,
+ endTime: null,
+ time: []
}
},
closeHandler () {
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 560799d..3e8e8ac 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -58,6 +58,20 @@
</el-table-column>
<el-table-column
align="center"
+ prop="status"
+ :formatter="statusFormatter"
+ label="鎻愪氦鐘舵��"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="markPaperStatus"
+ :formatter="statusFormatter"
+ label="闃呭嵎鐘舵��"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
prop="phone"
label="绯荤粺鑷姩浼板垎(閫夋嫨棰樺瀷)"
>
@@ -103,6 +117,13 @@
}
},
methods: {
+ statusFormatter(row) {
+ if (row.status === 'finish' || row.markPaperStatus === 'finish') {
+ return '瀹屾垚'
+ } else if (row.status === 'temp' || row.markPaperStatus === 'temp') {
+ return "鏈畬鎴�"
+ }
+ },
markPaper (row) {
// todo鎵撳紑闃呭嵎椤甸潰
},
--
Gitblit v1.8.0