zhangjie 2 달 전
부모
커밋
726696ab4e
3개의 변경된 파일24개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 0
      src/assets/styles/base.scss
  2. 20 8
      src/modules/admin/components/school/SchoolSetPaper.vue
  3. 1 0
      src/modules/mark/components/markParam/MarkParamGroup.vue

+ 3 - 0
src/assets/styles/base.scss

@@ -378,6 +378,9 @@ body {
 .color-dark {
   color: $--color-dark;
 }
+.color-dark-1 {
+  color: $--color-text-dark-1;
+}
 .color-gray {
   color: $--color-text-gray;
 }

+ 20 - 8
src/modules/admin/components/school/SchoolSetPaper.vue

@@ -8,17 +8,25 @@
     >
       <el-form-item prop="pdfSize" label="允许上传试卷规格:">
         <el-checkbox-group v-model="modalForm.pdfSize">
-          <el-checkbox v-for="item in sysPdfSize" :key="item" :label="item"
-            >{{ item }}
-            <span v-if="item === '8K'" style="margin-left: 5px">(270*390)</span>
+          <el-checkbox
+            v-for="item in sysPdfSize"
+            :key="item.size"
+            :label="item.name"
+          >
+            <span class="color-dark-1">{{ item.name }}</span>
+            <span class="color-gray-2 ml-1">({{ item.size }})</span>
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item prop="cardSize" label="答题卡规格:">
         <el-radio-group v-model="modalForm.cardSize">
-          <el-radio v-for="item in sysCardSize" :key="item" :label="item">
-            <span>{{ item }}</span>
-            <span v-if="item === '8K'" style="margin-left: 5px">(270*390)</span>
+          <el-radio
+            v-for="item in sysCardSize"
+            :key="item.size"
+            :label="item.name"
+          >
+            <span class="color-dark-1">{{ item.name }}</span>
+            <span class="color-gray-2 ml-1">({{ item.size }})</span>
           </el-radio>
         </el-radio-group>
       </el-form-item>
@@ -88,8 +96,12 @@ export default {
   methods: {
     async initData() {
       const paperData = await sysPaperSizeList();
-      this.sysPdfSize = paperData.result[0].value;
-      this.sysCardSize = paperData.result[1].value;
+      this.sysPdfSize = (paperData.result[0].value || []).map((item) =>
+        item ? JSON.parse(item) : ""
+      );
+      this.sysCardSize = (paperData.result[1].value || []).map((item) =>
+        item ? JSON.parse(item) : ""
+      );
       const data = await schoolSetPaperInfo(this.school.id);
       this.paperInfo = data.result;
       this.modalForm.pdfSize = data.result[0]?.value || [];

+ 1 - 0
src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -316,6 +316,7 @@ export default {
     },
     toSetArea(row) {
       this.curRow = row;
+      this.curRowQuestions = this.getCurrentQuestions(row);
       this.$refs.ModifyMarkArea.open();
     },
     async areaModified(row) {