deason 1 vuosi sitten
vanhempi
commit
eb20dc21b8

+ 3 - 2
src/main/resources/templates/admin/configExamPaper.ftlh

@@ -15,7 +15,7 @@
                 <el-col :span="8" :offset="8">
                     <h3 style="text-align: center">配置考试调卷规则</h3>
 
-                    <el-form label-position="left" label-width="80px" :model="curForm" ref="curForm" :rules="rules">
+                    <el-form label-position="right" label-width="100px" :model="curForm" ref="curForm" :rules="rules">
                         <el-form-item label="考试ID" prop="examId">
                             <el-input v-model="curForm.examId"></el-input>
                         </el-form-item>
@@ -44,7 +44,8 @@
             },
             rules: {
                 examId: [
-                    {required: true, message: '请输入考试ID', trigger: 'blur'}
+                    {required: true, message: '请输入考试ID', trigger: 'blur'},
+                    {pattern: /^[0-9]*$/, message: '请输入数字', trigger: 'blur'}
                 ]
             }
         },

+ 25 - 16
src/main/resources/templates/admin/createRandomPaperTemplate.ftlh

@@ -15,29 +15,33 @@
                 <el-col :span="8" :offset="8">
                     <h3 style="text-align: center">创建随机抽卷模板</h3>
 
-                    <el-form label-position="left" label-width="90px" :model="curForm" ref="curForm" :rules="rules">
+                    <el-form label-position="right" label-width="120px" :model="curForm" ref="curForm" :rules="rules">
                         <el-form-item label="考试ID" prop="examId">
                             <el-input v-model="curForm.examId"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="课程代码" prop="courseCodes">
-                            <el-input v-model="curForm.courseCodes" placeholder="多个值逗号分隔"></el-input>
+                        <el-form-item label="试卷结构类型">
+                            <el-radio-group v-model="curForm.structType">
+                                <el-radio label="1">精确结构</el-radio>
+                                <el-radio label="2">蓝图结构</el-radio>
+                            </el-radio-group>
                         </el-form-item>
 
-                        <el-form-item label="包含主观题">
-                            <el-radio-group v-model="curForm.needSubjective">
-                                <el-radio label="true">是</el-radio>
-                                <el-radio label="false">否</el-radio>
-                            </el-radio-group>
+                        <el-form-item label="试卷结构名称" prop="structName">
+                            <el-input v-model="curForm.structName"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="包含试题ID">
-                            <el-radio-group v-model="curForm.needQuestionId">
-                                <el-radio label="true">是</el-radio>
-                                <el-radio label="false">否</el-radio>
+                        <el-form-item label="试题来源">
+                            <el-radio-group v-model="curForm.questionPool">
+                                <el-radio label="1">题库</el-radio>
+                                <el-radio label="2">卷库</el-radio>
                             </el-radio-group>
                         </el-form-item>
 
+                        <el-form-item label="试卷名关键字" prop="paperKeywords">
+                            <el-input v-model="curForm.paperKeywords" placeholder="多个值逗号分隔"></el-input>
+                        </el-form-item>
+
                         <el-form-item>
                             <el-button type="primary" @click="doSubmit" round>确 认</el-button>
                         </el-form-item>
@@ -54,13 +58,18 @@
         data: {
             curForm: {
                 examId: null,
-                courseCodes: null,
-                needSubjective: "true",
-                needQuestionId: "false",
+                structType: "1",
+                structName: "",
+                questionPool: "1",
+                paperKeywords: "",
             },
             rules: {
                 examId: [
-                    {required: true, message: '请输入考试ID', trigger: 'blur'}
+                    {required: true, message: '请输入考试ID', trigger: 'blur'},
+                    {pattern: /^[0-9]*$/, message: '请输入数字', trigger: 'blur'}
+                ],
+                structName: [
+                    {required: true, message: '请输入试卷结构名称', trigger: 'blur'}
                 ]
             }
         },

+ 4 - 3
src/main/resources/templates/admin/exportStudentAnswerAndScoreDetail.ftlh

@@ -15,7 +15,7 @@
                 <el-col :span="8" :offset="8">
                     <h3 style="text-align: center">导出考生试题作答和得分明细</h3>
 
-                    <el-form label-position="left" label-width="90px" :model="curForm" ref="curForm" :rules="rules">
+                    <el-form label-position="right" label-width="100px" :model="curForm" ref="curForm" :rules="rules">
                         <el-form-item label="考试ID" prop="examId">
                             <el-input v-model="curForm.examId"></el-input>
                         </el-form-item>
@@ -55,12 +55,13 @@
             curForm: {
                 examId: null,
                 courseCodes: null,
-                needSubjective: "true",
+                needSubjective: "false",
                 needQuestionId: "false",
             },
             rules: {
                 examId: [
-                    {required: true, message: '请输入考试ID', trigger: 'blur'}
+                    {required: true, message: '请输入考试ID', trigger: 'blur'},
+                    {pattern: /^[0-9]*$/, message: '请输入数字', trigger: 'blur'}
                 ]
             }
         },

+ 3 - 2
src/main/resources/templates/admin/updateCorrectAnswerAndReFixScore.ftlh

@@ -15,7 +15,7 @@
                 <el-col :span="8" :offset="8">
                     <h3 style="text-align: center">更新正确答案并重新算分</h3>
 
-                    <el-form label-position="left" label-width="80px" :model="curForm" ref="curForm" :rules="rules">
+                    <el-form label-position="right" label-width="100px" :model="curForm" ref="curForm" :rules="rules">
                         <el-form-item label="考试ID" prop="examId">
                             <el-input v-model="curForm.examId"></el-input>
                         </el-form-item>
@@ -44,7 +44,8 @@
             },
             rules: {
                 examId: [
-                    {required: true, message: '请输入考试ID', trigger: 'blur'}
+                    {required: true, message: '请输入考试ID', trigger: 'blur'},
+                    {pattern: /^[0-9]*$/, message: '请输入数字', trigger: 'blur'}
                 ]
             }
         },