From b57f2a267747845f2846002e7042c38727f12c45 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 10:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/ExamManage.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index 3cccf66..53261b4 100644
--- a/src/views/exam/exam/ExamManage.vue
+++ b/src/views/exam/exam/ExamManage.vue
@@ -7,11 +7,11 @@
<div>
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="鑰冭瘯鍚嶇О">
- <el-input v-model="searchForm.examName" @input="page" clearable size="small" clearable @clear="page"
+ <el-input v-model="searchForm.examName" @input="page" clearable size="small" @clear="page"
placeholder="鐝骇鍚嶇О"></el-input>
</el-form-item>
<el-form-item label="鍙傝�冪彮绾�">
- <el-select v-model="searchForm.classesId" @change="page" clearable @clear="page">
+ <el-select v-model="searchForm.classesId" @change="page" clearable size="small" @clear="page">
<el-option v-for="classes in classesList" :key="classes.id" :value="classes.id"
:label="classes.className"/>
</el-select>
@@ -22,26 +22,30 @@
</el-form>
</div>
</div>
- <el-table :data="tableData" border>
+ <el-table :data="tableData" border style="width: 100%">
<el-table-column
label="鑰冭瘯鍚嶇О"
+ width="150px"
prop="examName"
></el-table-column>
<el-table-column
label="鑰冭瘯璇曞嵎"
prop="examPaperName"
+ width="200px"
></el-table-column>
<el-table-column
label="鍙傝�冪彮绾�"
+ width="200px"
prop="className"
></el-table-column>
- <el-table-column
- label="鐝骇浜烘暟"
- prop="studentNum"
- ></el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鐝骇浜烘暟"-->
+ <!-- prop="studentNum"-->
+ <!-- ></el-table-column>-->
<el-table-column
label="鑰冭瘯鍦扮偣"
prop="examPlace"
+ width="150px"
></el-table-column>
<el-table-column
label="鑰冭瘯鐘舵��"
@@ -61,15 +65,16 @@
</el-table-column>
<el-table-column
label="鍒涘缓鏃堕棿"
- width="150px"
+ width="160px"
prop="createTime"
></el-table-column>
- <el-table-column label="鎿嶄綔" fiexd="right">
+ <el-table-column label="鎿嶄綔" fixed="right" width="220px">
<template slot-scope="scope">
<el-button
type="primary"
size="small"
@click="handlerEdit(scope.row)"
+ v-if="scope.row.status === 'not_start'"
>淇敼
</el-button>
<el-popconfirm
@@ -81,7 +86,10 @@
<el-button slot="reference" type="danger" size="small">鍒犻櫎</el-button>
</el-popconfirm>
- <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
+ <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">
+ 闃呭嵎
+ </el-button>
+ <el-button v-if="scope.row.status === 'ing'" type="warning" size="small" @click="monitor(scope.row)">鐩戞帶</el-button>
</template>
</el-table-column>
</el-table>
@@ -203,6 +211,10 @@
this.MyExamPaperList()
},
methods: {
+ // 鑰冭瘯鐩戞帶鍒楄〃
+ monitor (row) {
+ this.$router.push({ path: '/exam/monitor', query: { examId: row.id } })
+ },
markPaper (row) {
// 璺宠浆闃呭嵎椤甸潰
this.$router.push({ path: '/exam/mark/paper', query: { examName: row.examName, examId: row.id } })
@@ -239,16 +251,22 @@
this.classesList = res.data.data
})
},
- deleteExam (id) {
- deleteExamById(id).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.page()
+ deleteExam (row) {
+ this.$confirm('纭鏄惁鍒犻櫎' + row.examName + '?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteExamById(row.id).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.page()
+ })
})
},
handlerEdit (row) {
this.examForm = {
...row,
- time: [row.startTime, row.endTime]
+ time: [row.startTime, row.endTime]
}
this.title = '淇敼鑰冭瘯'
this.open = true
--
Gitblit v1.8.0