zhangjie 3 vuotta sitten
vanhempi
commit
3ab488f37d

+ 5 - 5
card/assets/styles/card-preview.scss

@@ -17,7 +17,7 @@
     page-break-after: always;
   }
   // 印刷模式:隐藏客观题强调标记
-  .elem-fill-question {
+  .elem-fill-question-first {
     &::before {
       display: none;
     }
@@ -1094,7 +1094,7 @@
   white-space: normal;
 
   // 客观题强调标记
-  &::before {
+  &-first::before {
     content: "";
     position: absolute;
     right: 0;
@@ -1107,19 +1107,19 @@
     border-bottom-left-radius: 10px;
   }
 
-  &-simple {
+  &-first.elem-fill-question-simple {
     &::before {
       content: "单选";
       background-color: mix(#fff, $--color-success, 20%);
     }
   }
-  &-multiply {
+  &-first.elem-fill-question-multiply {
     &::before {
       content: "多选";
       background-color: $--color-primary-light;
     }
   }
-  &-boolean {
+  &-first.elem-fill-question-boolean {
     &::before {
       content: "判断";
       background-color: mix(#fff, $--color-warning, 20%);

+ 9 - 5
card/elements/fill-question/ElemFillQuestion.vue

@@ -1,9 +1,6 @@
 <template>
   <div :class="classes">
-    <div
-      class="elem-title"
-      v-if="data.parent && data.startNumber === data.parent.startNumber"
-    >
+    <div class="elem-title" v-if="isFirstSpin">
       {{ data.parent.topicName }}
     </div>
     <div class="elem-body">
@@ -42,6 +39,12 @@ export default {
     }
   },
   computed: {
+    isFirstSpin() {
+      return (
+        this.data.parent &&
+        this.data.startNumber === this.data.parent.startNumber
+      );
+    },
     classes() {
       return [
         "elem-fill-question",
@@ -50,7 +53,8 @@ export default {
           "elem-fill-question-simple":
             !this.data.isMultiply && !this.data.isBoolean,
           "elem-fill-question-multiply": this.data.isMultiply,
-          "elem-fill-question-boolean": this.data.isBoolean
+          "elem-fill-question-boolean": this.data.isBoolean,
+          "elem-fill-question-first": this.isFirstSpin
         }
       ];
     },

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
card/previewTemp.js


+ 16 - 2
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -58,7 +58,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="试卷编号:">
+            <el-form-item prop="paperNumber" label="试卷编号:">
               <el-input
                 v-model.trim="examTask.paperNumber"
                 placeholder="试卷编号不填写时会自动生成"
@@ -68,7 +68,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="拟卷教师:">
+            <el-form-item prop="teacherName" label="拟卷教师:">
               <el-input
                 v-model.trim="examTask.teacherName"
                 placeholder="请输入拟卷教师"
@@ -315,6 +315,20 @@ export default {
             message: "请选择课程",
             trigger: "change"
           }
+        ],
+        paperNumber: [
+          {
+            message: "试卷编号不能超过50个字符",
+            max: 50,
+            trigger: "change"
+          }
+        ],
+        teacherName: [
+          {
+            message: "拟卷教师不能超过50个字符",
+            max: 50,
+            trigger: "change"
+          }
         ]
       },
       examTask: {},

+ 10 - 2
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -109,12 +109,20 @@
         </el-table-column>
         <el-table-column prop="examPlace" label="考点名称">
           <template slot-scope="scope">
-            <el-input v-model.trim="scope.row.examPlace" clearable></el-input>
+            <el-input
+              v-model.trim="scope.row.examPlace"
+              :maxlength="100"
+              clearable
+            ></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="examRoom" label="考场名称">
           <template slot-scope="scope">
-            <el-input v-model.trim="scope.row.examRoom" clearable></el-input>
+            <el-input
+              v-model.trim="scope.row.examRoom"
+              :maxlength="50"
+              clearable
+            ></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="printHouseName" label="印刷室">

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä