zhangjie 2 주 전
부모
커밋
9c83b6ef63

+ 1 - 1
src/modules/admin/components/school/SchoolSetTarget.vue

@@ -6,7 +6,7 @@
       :model="modalForm"
       :rules="rules"
     >
-      <el-form-item prop="attachmentId" label="选择文件:">
+      <el-form-item label="选择文件:">
         <upload-file-view
           :upload-data="uploadData"
           :upload-url="uploadUrl"

+ 3 - 3
src/modules/card/components/CardBuildDialog.vue

@@ -174,8 +174,8 @@ export default {
         const paperSimpleStruct = getPaperJsonSimpleStructInfo(paperJson);
         const elementTypePreSetInfo = {
           FILL_QUESTION: {
-            pageSize: this.sysCardSize,
-            columnNumber: 2,
+            pageSize: this.cardConfig.pageSize,
+            columnNumber: this.cardConfig.columnNumber,
           },
         };
         const elements = buildCardFromPaperSimpleStruct(
@@ -294,7 +294,7 @@ export default {
         ...data,
         ...{
           pageSize: this.sysCardSize,
-          columnNumber: 2,
+          columnNumber: this.sysCardSize === "A4" ? 1 : 2,
           columnGap: 20,
           showForbidArea: false,
           makeMethod: "SELF",

+ 2 - 2
src/modules/card/views/CardEdit.vue

@@ -210,8 +210,8 @@ export default {
         const examRule = await examRuleDetail();
         const extendFields = examRule.extendFields || "[]";
         const config = {
-          pageSize: this.sysCardSize === "A4" ? 1 : 2,
-          columnNumber: 2,
+          pageSize: this.sysCardSize,
+          columnNumber: this.sysCardSize === "A4" ? 1 : 2,
           columnGap: 20,
           showForbidArea: false,
           requiredFields,