From f2e3affd102f6cd98448ef70c12ee3ca81afc659 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 04 七月 2024 17:57:01 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 src/views/exam/exam/ExamManage.vue |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index 11054e4..cdba0cb 100644
--- a/src/views/exam/exam/ExamManage.vue
+++ b/src/views/exam/exam/ExamManage.vue
@@ -72,6 +72,16 @@
             @click="handlerEdit(scope.row)"
           >淇敼
           </el-button>
+          <el-popconfirm
+            v-if="scope.row.status === 'not_start'"
+            style="margin: 0 5px"
+            title="纭畾瑕佸垹闄よ鑰冭瘯鍚楋紵"
+            @confirm="deleteExam(scope.row.id)"
+          >
+            <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 type="danger" size="small" @click="deleteExam(scope.row.id)">鍒犻櫎</el-button>
           <el-button type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
           <el-button type="warning" size="small" @click="monitor(scope.row)">鐩戞帶</el-button>

--
Gitblit v1.8.0