描红

src/views/wordcard/cread.vue

@@ -80,6 +80,7 @@
                 <el-input
                   style="width: 60px;text-align:center"
                   v-model="from.writeBoxNumber"
+                  type="number"
                 ></el-input>
                 <span style="margin-left: 8px">{{
                   typeIndex == 0 ? "行" : "句"
@@ -90,6 +91,7 @@
                 <el-input
                   style="width: 60px;text-align:center"
                   v-model="from.miaoRedBoxNumber"
+                  type="number"
                 ></el-input>
                 <span style="margin-left: 8px">{{
                   typeIndex == 0 ? "格" : "句"
@@ -100,6 +102,7 @@
                 <el-input
                   style="width: 60px;text-align:center"
                   v-model="from.lastNullrow"
+                  type="number"
                 ></el-input>
                 <span style="margin-left: 8px">行</span>
               </div>
@@ -324,16 +327,27 @@ export default {
                       });
                     }
                     // 描红格
-                    if (i == 0 && data.miaoRedBoxNumber) {
-                      for (let j = 0; j < data.miaoRedBoxNumber; j++) {
-                        numrow[j] = {
-                          con: item.con,
-                          miaoRed: true,
-                          write: true,
-                        };
-                      }
+                    if (i==0&&data.miaoRedBoxNumber) {
+                        let m = Math.ceil(data.miaoRedBoxNumber/data.rowNumber) > data.writeBoxNumber ? data.writeBoxNumber : Math.ceil(data.miaoRedBoxNumber/data.rowNumber)
+                        for (let j = 0; j < m; j++) {
+                            let miaoArr = []
+                            for(let l = 0; l < data.rowNumber; l++){
+                                if(j*data.rowNumber+l<data.miaoRedBoxNumber){
+                                    miaoArr[l] = {
+                                        con: item.con,
+                                        miaoRed: true,
+                                        write: true,
+                                    };
+                                }else{
+                                    miaoArr[l] = {
+                                        con: item.con,
+                                        write: true,
+                                    }
+                                }
+                            }
+                            allArr.push(JSON.parse(JSON.stringify(miaoArr)));
+                        }
                     }
-                    allArr.push(numrow);
                   }
                 }
               });
@@ -350,7 +364,6 @@ export default {
               }
               data.result = this.arrSplice(allArr, data.pageNumber);
               this.writeTableData = data
-              console.log(data)
               clearInterval(timer);
               timer = null;
             }
@@ -365,10 +378,20 @@ export default {
             });
             // 如果不满一行则补满
             let newarr = [];
+            let areadyMiao = 0
             if (arr.length % data.rowNumber != 0) {
               let num = data.rowNumber - (arr.length % data.rowNumber);
               for (let i = 0; i < num; i++) {
-                arr.push({});
+                if (data.miaoRedBoxNumber&&i<data.miaoRedBoxNumber) {
+                    arr.push({
+                        con: item.con,
+                        miaoRed: true,
+                        write: true,
+                    });
+                    areadyMiao++;
+                }else{
+                    arr.push({});
+                }
               }
               if (arr.length > data.rowNumber) {
                 newarr = this.arrSplice(arr, data.rowNumber);
@@ -392,16 +415,27 @@ export default {
                   });
                 }
                 // 描红格
-                if (i == 0 && data.miaoRedBoxNumber) {
-                  for (let j = 0; j < data.miaoRedBoxNumber; j++) {
-                    numrow[j] = {
-                      con: item.con,
-                      miaoRed: true,
-                      write: true,
-                    };
-                  }
+                if (i==0&&data.miaoRedBoxNumber) {
+                    let m = Math.ceil((data.miaoRedBoxNumber-areadyMiao)/data.rowNumber) > data.writeBoxNumber ? data.writeBoxNumber : Math.ceil((data.miaoRedBoxNumber-areadyMiao)/data.rowNumber)
+                    for (let j = 0; j < m; j++) {
+                        let miaoArr = []
+                        for(let l = 0; l < data.rowNumber; l++){
+                            if(j*data.rowNumber+l<(data.miaoRedBoxNumber-areadyMiao)){
+                                miaoArr[l] = {
+                                    con: item.con,
+                                    miaoRed: true,
+                                    write: true,
+                                };
+                            }else{
+                                miaoArr[l] = {
+                                    con: item.con,
+                                    write: true,
+                                }
+                            }
+                        }
+                        allArr.push(JSON.parse(JSON.stringify(miaoArr)));
+                    }
                 }
-                allArr.push(numrow);
               }
             }
           });
@@ -417,6 +451,7 @@ export default {
             }
           }
           data.result = this.arrSplice(allArr, data.pageNumber);
+          this.writeTableData = data
         }
       } else {
         // 处理句模式数据