From d7bee17c1d8fdb9a2a3c0303d7c38bc74a778e31 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 16 十月 2024 10:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/ExamManage.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index a2e8232..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,17 +22,20 @@
</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-->
@@ -42,6 +45,7 @@
<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" width="280px">
+ <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
@@ -84,7 +89,7 @@
<el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">
闃呭嵎
</el-button>
- <el-button type="warning" size="small" @click="monitor(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>
--
Gitblit v1.8.0