zcdsj
/
examtest
mirror of https://e.coding.net/ctcdevteam/examtest.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

前端页面增加参考机会

This commit is contained in:
caoqianming 2021-05-08 11:42:06 +08:00
parent d4f07aa39a
commit 38e58451db
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test_client/src/views/exam/index.vue
View File

@ -40,6 +40,9 @@
<el-table-column label="工作类别"> <el-table-column label="工作类别">
<template slot-scope="scope">{{ scope.row.workscope_name }}</template> <template slot-scope="scope">{{ scope.row.workscope_name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="参考机会">
<template slot-scope="scope">{{ scope.row.chance }}</template>
</el-table-column>
<el-table-column label="开启时间"> <el-table-column label="开启时间">
<template slot-scope="scope">{{ scope.row.opentime }}</template> <template slot-scope="scope">{{ scope.row.opentime }}</template>
</el-table-column> </el-table-column>
@ -98,6 +101,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </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-form-item label="开启时间" prop="opentime">
<el-date-picker <el-date-picker
v-model="exam.opentime" v-model="exam.opentime"
@ -144,6 +150,7 @@ const defaultexam = {
place: "", place: "",
opentime: null, opentime: null,
closetime: null, closetime: null,
chance:3
}; };
const listQuery = { const listQuery = {
page: 1, page: 1,
@ -172,7 +179,8 @@ export default {
opentime: [{ required: true, message: "请选择", trigger: "change" }], opentime: [{ required: true, message: "请选择", trigger: "change" }],
closetime: [{ required: true, message: "请选择", trigger: "change" }], closetime: [{ required: true, message: "请选择", trigger: "change" }],
proctor_name: [{ 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" }]
}, },
}; };
}, },

2
test_server/examtest/serializers.py
View File

@ -167,7 +167,7 @@ class PaperQuestionsCreateSerializer(serializers.ModelSerializer):
class ExamCreateUpdateSerializer(serializers.ModelSerializer): class ExamCreateUpdateSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Exam 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): class ExamListSerializer(serializers.ModelSerializer):
create_admin_username = serializers.StringRelatedField(source='create_admin') create_admin_username = serializers.StringRelatedField(source='create_admin')

2
test_server/examtest/views.py
View File

@ -106,7 +106,7 @@ class ExamViewSet(ModelViewSet):
try: try:
exam = Exam.objects.get(code=code, opentime__lt=now, closetime__gt=now) exam = Exam.objects.get(code=code, opentime__lt=now, closetime__gt=now)
tests = ExamTest.objects.filter(exam=exam, consumer=request.user) 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({'exam':exam.pk})
return Response({'error':'考试机会不足'}) return Response({'error':'考试机会不足'})
except: except: