From 36c3aa845f12278e2bb896a01872e31eff41bbc7 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 2 Jul 2024 13:44:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:exam=20=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/exam/questions.vue | 6 +++---
 server/apps/exam/views.py           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/views/exam/questions.vue b/client/src/views/exam/questions.vue
index 9b2589e..957eed8 100644
--- a/client/src/views/exam/questions.vue
+++ b/client/src/views/exam/questions.vue
@@ -36,8 +36,8 @@
                     <el-button slot="reference">Excel导入</el-button>
                 </el-popover>
                 <el-button type="primary" icon="el-icon-download" @click="exportQuestions">导出Excel</el-button>
-                <el-button type="primary" v-if="checkPermission(['question_import'])" icon="el-icon-download" @click="handleImport">导入word</el-button>
-                <el-dialog
+                <!-- <el-button type="primary" v-if="checkPermission(['question_import'])" icon="el-icon-download" @click="handleImport">导入word</el-button> -->
+                <!-- <el-dialog
                     :visible.sync="impDialogVisible"
                     title="上传试题"
                     :left="'200px'"
@@ -71,7 +71,7 @@
             <el-button type="danger" @click="impDialogVisible=false">取消</el-button>
             <el-button type="primary" @click="impDialogVisible=false">确认</el-button>
           </div>
-        </el-dialog>
+        </el-dialog> -->
                 <el-button type="danger" v-if="checkPermission(['question_batch_delete'])" :disabled="this.selects.length==0" @click="batchDelete()">批量删除</el-button> 
             </div>
         </div>
diff --git a/server/apps/exam/views.py b/server/apps/exam/views.py
index afd1719..14245a4 100644
--- a/server/apps/exam/views.py
+++ b/server/apps/exam/views.py
@@ -527,7 +527,7 @@ class ExamViewSet(CreateUpdateCustomMixin, ModelViewSet):
         tests = ExamRecord.objects.filter(
                 exam=exam, create_by=request.user)
         chance_used = tests.count()
-        if chance_used > exam.chance:
+        if chance_used >= exam.chance:
             raise ParseError('考试机会已用完')
         if exam.paper:
             details = []