From 38e58451db7a97b678bf7fcbc7b12b81d75adbb4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 8 May 2021 11:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E8=80=83=E6=9C=BA=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/views/exam/index.vue | 10 +++++++++-
 test_server/examtest/serializers.py  |  2 +-
 test_server/examtest/views.py        |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test_client/src/views/exam/index.vue b/test_client/src/views/exam/index.vue
index fc1dc14..d4eba4f 100644
--- a/test_client/src/views/exam/index.vue
+++ b/test_client/src/views/exam/index.vue
@@ -40,6 +40,9 @@
           <el-table-column label="工作类别">
             <template slot-scope="scope">{{ scope.row.workscope_name }}</template>
           </el-table-column>
+          <el-table-column label="参考机会">
+            <template slot-scope="scope">{{ scope.row.chance }}</template>
+          </el-table-column>
           <el-table-column label="开启时间">
             <template slot-scope="scope">{{ scope.row.opentime }}</template>
           </el-table-column>
@@ -98,6 +101,9 @@
             ></el-option>
         </el-select>
         </el-form-item>
+        <el-form-item label="参考机会" prop="chance">
+          <el-input-number v-model="exam.chance" placeholder="参考机会" :min="1"/>
+        </el-form-item>
         <el-form-item label="开启时间" prop="opentime">
           <el-date-picker
       v-model="exam.opentime"
@@ -144,6 +150,7 @@ const defaultexam = {
         place: "",
         opentime: null,
         closetime: null,
+        chance:3
       };
 const listQuery = {
   page: 1,
@@ -172,7 +179,8 @@ export default {
         opentime: [{ required: true, message: "请选择", trigger: "change" }],
         closetime: [{ required: true, message: "请选择", trigger: "change" }],
         proctor_name: [{ required: true, message: "请输入", trigger: "change" }],
-        proctor_phone: [{ required: true, message: "请输入", trigger: "change" }]
+        proctor_phone: [{ required: true, message: "请输入", trigger: "change" }],
+        chance: [{ required: true, message: "请输入", trigger: "change" }]
       },
     };
   },
diff --git a/test_server/examtest/serializers.py b/test_server/examtest/serializers.py
index 6cdfbc9..d7f668e 100644
--- a/test_server/examtest/serializers.py
+++ b/test_server/examtest/serializers.py
@@ -167,7 +167,7 @@ class PaperQuestionsCreateSerializer(serializers.ModelSerializer):
 class ExamCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Exam
-        fields = ['name', 'place', 'opentime', 'closetime', 'proctor_name', 'proctor_phone', 'workscope']
+        fields = ['name', 'place', 'opentime', 'closetime', 'proctor_name', 'proctor_phone', 'workscope', 'chance']
 
 class ExamListSerializer(serializers.ModelSerializer):
     create_admin_username = serializers.StringRelatedField(source='create_admin')
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 2e71877..cfc3f55 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -106,7 +106,7 @@ class ExamViewSet(ModelViewSet):
             try:
                 exam = Exam.objects.get(code=code, opentime__lt=now, closetime__gt=now)
                 tests = ExamTest.objects.filter(exam=exam, consumer=request.user)
-                if tests.count() <= exam.chance: # 还有考试机会就可以接着考
+                if tests.count() < exam.chance: # 还有考试机会就可以接着考
                     return Response({'exam':exam.pk})
                 return Response({'error':'考试机会不足'})
             except: