bug 修改

card/api.js

@@ -57,11 +57,3 @@ export const saveCard = datas => {
 export const submitCard = datas => {
   return $post("/api/print/card/submit", datas);
 };
-
-export default {
-  cardConfigInfos,
-  cardDetailEdit,
-  cardTempDetail,
-  saveCard,
-  submitCard
-};

card/elements/fill-line/EditFillLine.vue

@@ -26,6 +26,7 @@
           :step="1"
           step-strictly
           :controls="false"
+          @change="lineTypeChange"
         ></el-input-number>
         <span class="el-input-split"></span>
         <el-input-number
@@ -36,6 +37,7 @@
           :step="1"
           step-strictly
           :controls="false"
+          @change="lineTypeChange"
         ></el-input-number>
       </el-form-item>
       <el-form-item prop="lineSpacing" label="空位上下间距：">
@@ -105,7 +107,7 @@
         <span class="el-input-tips">*指每一小题的空位数量</span>
       </el-form-item>
       <el-form-item v-else prop="questionLineNums" label="各小题空数：">
-        <table class="table table-white">
+        <table class="table table-white table-narrow">
           <tr>
             <th>题号</th>
             <th>空数</th>
@@ -235,6 +237,13 @@ export default {
     },
     lineTypeChange() {
       // check start end number
+      if (
+        !this.modalForm.startNumber ||
+        !this.modalForm.endNumber ||
+        this.modalForm.startNumber > this.modalForm.endNumber
+      )
+        return;
+
       if (this.modalForm.questionLineType === "custom") {
         let questionLineNumOptions = [];
         for (

card/elements/fill-line/model.js

@@ -54,7 +54,7 @@ const getFullModel = model => {
     for (let i = 0; i < total; i++) {
       const childQuestionLineNums = questionLineNums.slice(
         i * numPerLine,
-        numPerLine
+        (i + 1) * numPerLine
       );
       const maxLineNumberPerQuestion = Math.max.apply(
         null,

card/views/CardDesign.vue

@@ -89,7 +89,7 @@
               </div>
             </div>
             <!-- Develop btns -->
-            <card-config-prop-edit></card-config-prop-edit>
+            <!-- <card-config-prop-edit></card-config-prop-edit> -->
           </div>
           <!-- <br /><br /> -->
           <!-- <el-button @click="initCard">新建页面</el-button> -->
@@ -258,8 +258,8 @@ import {
   ELEMENT_LIST,
   TOPIC_LIST
 } from "../elementModel";
-import { transformField, getAOrBSystem } from "../enumerate";
-import CardConfigPropEdit from "../components/CardConfigPropEdit";
+import { transformField, getAOrBSystem, CARD_VERSION } from "../enumerate";
+// import CardConfigPropEdit from "../components/CardConfigPropEdit";
 import TopicElementEdit from "../components/TopicElementEdit";
 import TopicElementPreview from "../components/TopicElementPreview";
 import PagePropEdit from "../components/PagePropEdit";
@@ -273,7 +273,7 @@ import TopicSelectDialog from "../components/TopicSelectDialog";
 export default {
   name: "card-design",
   components: {
-    CardConfigPropEdit,
+    // CardConfigPropEdit,
     TopicElementEdit,
     TopicElementPreview,
     PagePropEdit,
@@ -286,7 +286,6 @@ export default {
   },
   data() {
     return {
-      defaultCardId: 1,
       cardId: this.$route.params.cardId || this.$ls.get("cardId"),
       cardDetailId: this.$ls.get("cardDetailId"),
       prepareTcPCard: this.$ls.get("prepareTcPCard", {}),
@@ -297,7 +296,7 @@ export default {
       columnWidth: 0,
       cardPreviewUrl: "",
       isSubmit: false,
-      canSave: true
+      canSave: false
     };
   },
   computed: {
@@ -406,7 +405,7 @@ export default {
       };
       if (aOrBSystem !== null) config.aOrBSystem = aOrBSystem;
       config.aOrB = !!config["aOrBSystem"];
-      this.setCardConfig(data);
+      this.setCardConfig(config);
     },
     addNewTopic(item) {
       let element = getElementModel(item.type);
@@ -553,10 +552,21 @@ export default {
 
       return true;
     },
+    getModel() {
+      return JSON.stringify(
+        {
+          version: CARD_VERSION,
+          cardConfig: this.cardConfig,
+          paperParams: this.paperParams,
+          pages: this.pages
+        },
+        (k, v) => (k.startsWith("_") ? undefined : v)
+      );
+    },
     async save() {
       if (!this.checkCardValid()) return;
 
-      const result = await saveCard(this.getCardData());
+      const result = await saveCard(this.getCardData("", this.getModel()));
       this.cardDetailId = result.cardDetailId;
       this.cardId = result.cardId;
       this.$ls.set("cardDetailId", this.cardDetailId);

src/assets/styles/element-ui-costom.scss

@@ -110,7 +110,7 @@
   .el-input__inner {
     border-radius: 7px;
     border-color: #ddd;
-    background-color: #f5f5f5;
+    background-color: #fff;
   }
 }
 // upload

src/assets/styles/home.scss

@@ -385,6 +385,19 @@
       background-color: $--color-white;
     }
   }
+
+  &.table-white {
+    background-color: #fff;
+  }
+  &.table-narrow {
+    border-radius: 0;
+    margin: 0;
+
+    td,
+    th {
+      padding: 8px;
+    }
+  }
 }
 
 /* list */