修改字词卡片描红和默写规则

src/views/wordcard/cread.vue

@@ -496,13 +496,13 @@ export default {
         this.$message.warning('请先输入配置内容');
         return;
       }
-      if (Number(this.from.writeBoxNumber) < Number(this.from.miaoRedBoxNumber) && this.typeIndex == 1) {
-        this.$message.warning('默写数不能小于描红数');
-        return;
-      } else if (Number(this.from.writeBoxNumber) < Math.ceil(this.from.miaoRedBoxNumber) && this.typeIndex == 0) {
-        this.$message.warning('默写数不能小于描红所用行数');
-        return;
-      }
+      // if (Number(this.from.writeBoxNumber) < Number(this.from.miaoRedBoxNumber) && this.typeIndex == 1) {
+      //   this.$message.warning('默写数不能小于描红数');
+      //   return;
+      // } else if (Number(this.from.writeBoxNumber) < Math.ceil(this.from.miaoRedBoxNumber) && this.typeIndex == 0) {
+      //   this.$message.warning('默写数不能小于描红所用行数');
+      //   return;
+      // }
       let option = [];
       let contentArr = this.from.content.split('\n');
       for (let i = 0; i < contentArr.length; i++) {
@@ -700,7 +700,7 @@ export default {
           }
           // 添加书写行
           if (data.writeBoxNumber) {
-            for (let i = 0; i < data.writeBoxNumber; i++) {
+            for (let i = 0; i < Number(data.writeBoxNumber) + Number(data.miaoRedBoxNumber); i++) {
               let numrow = [];
               for (let k = 0; k < data.rowNumber; k++) {
                 numrow.push({
@@ -711,9 +711,10 @@ export default {
               // 描红格
               if (i == 0 && data.miaoRedBoxNumber) {
                 let m =
-                  Number(data.miaoRedBoxNumber) > Number(data.writeBoxNumber)
-                    ? Number(data.writeBoxNumber)
-                    : Number(data.miaoRedBoxNumber);
+                  // Number(data.miaoRedBoxNumber) > Number(data.writeBoxNumber)
+                  //   ? Number(data.writeBoxNumber)
+                  //   : Number(data.miaoRedBoxNumber);
+                  Number(data.miaoRedBoxNumber);
                 let s = Math.ceil((m * data.rowNumber) / item.hz_list.length); // 循环多少次词组
                 let miaoArr = [];
                 for (let j = 0; j < s; j++) {
@@ -735,7 +736,7 @@ export default {
                 arrOption = JSON.parse(JSON.stringify(result));
               }
               arrOption.push(numrow);
-              arrOption = arrOption.slice(0, data.writeBoxNumber);
+              arrOption = arrOption.slice(0, Number(data.writeBoxNumber) + Number(data.miaoRedBoxNumber));
             }
             arrOption.forEach((itemA) => {
               arr.push(itemA);
@@ -950,7 +951,7 @@ export default {
           }
           // 书写内容
           if (data.writeBoxNumber > 0) {
-            for (let w = 0; w < Number(sentence) * Number(data.writeBoxNumber); w++) {
+            for (let w = 0; w < Number(sentence) * (Number(data.writeBoxNumber) + Number(data.miaoRedBoxNumber)); w++) {
               let sentenceItemWrite = [];
               for (let j = 0; j < data.rowNumber; j++) {
                 sentenceItemWrite.push({});
@@ -958,7 +959,10 @@ export default {
               sentenceArr.push(JSON.parse(JSON.stringify(sentenceItemWrite)));
             }
           }
-          sentenceArr = sentenceArr.slice(0, Number(sentence) * Number(data.writeBoxNumber));
+          sentenceArr = sentenceArr.slice(
+            0,
+            Number(sentence) * (Number(data.writeBoxNumber) + Number(data.miaoRedBoxNumber)),
+          );
           sentenceArr.forEach((itemS, indexS) => {
             allArr.push(JSON.parse(JSON.stringify(itemS)));
           });