Browse Source

句子书写

natasha 2 years ago
parent
commit
177a602339
2 changed files with 50 additions and 41 deletions
  1. 2 1
      src/components/corpus/Strockred.vue
  2. 48 40
      src/views/wordcard/cread.vue

+ 2 - 1
src/components/corpus/Strockred.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="strockredBox">
+  <div class="strockredBox" v-if="targetDiv">
     <div class="strockred">
       <div @click="resetHanzi" class="strock-play-box" v-if="1 == 2">
         <!-- <img src="../../assets/common/strock-play.png" class="strock-play" /> -->
@@ -59,6 +59,7 @@ export default {
           let _this = this;
           _this.$nextTick(() => {
             _this.initHanziwrite();
+            _this.$forceUpdate();
           });
         }
       },

+ 48 - 40
src/views/wordcard/cread.vue

@@ -472,6 +472,7 @@ export default {
         // 处理句模式数据
         let allArr = [];
         data.option.forEach((item) => {
+            let sentenceArr = [] // 每一句的内容
             let sentence = Math.ceil(item.length/data.rowNumber)
             for(let k=0; k<sentence; k++){
                 let sentenceItem = []
@@ -486,52 +487,59 @@ export default {
                 }
                allArr.push(JSON.parse(JSON.stringify(sentenceItem))) 
             }
-            let sentenceMiao = []
-            for(let k=0; k<sentence; k++){
-                let sentenceItemMiao = []
-                this.loading = true
-                for(let s=0; s< data.rowNumber; s++){
-                    if(k*data.rowNumber+s<item.length){
-                        sentenceItemMiao[s] = {
-                            con: item[k*data.rowNumber+s],
-                            miaoRed: true,
-                            hzDetail: null
+            if(data.miaoRedBoxNumber>0&&data.writeBoxNumber>0){
+                let sentenceMiao = []
+                for(let k=0; k<sentence; k++){
+                    let sentenceItemMiao = []
+                    this.loading = true
+                    for(let s=0; s< data.rowNumber; s++){
+                        if(k*data.rowNumber+s<item.length){
+                            sentenceItemMiao[s] = {
+                                con: item[k*data.rowNumber+s],
+                                miaoRed: true,
+                                hzDetail: null
+                            }
+                            let MethodName = "hz_resource_manager-GetHZStrokesContent";
+                            getLogin(MethodName, {hz:item[k*data.rowNumber+s]})
+                            .then((res) => {
+                                this.$set(sentenceItemMiao[s].hzDetail,"hz_json",res)
+                            })
+                            .catch(() => {
+                                this.loading = false;
+                            });
+                            
+                        }else{
+                            sentenceItemMiao[s] = {}
                         }
-                        let MethodName = "hz_resource_manager-GetHZStrokesContent";
-                        getLogin(MethodName, {hz:item[k*data.rowNumber+s]})
-                        .then((res) => {
-                            this.$set(sentenceItemMiao[s].hzDetail,"hz_json",res)
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
-                        
-                    }else{
-                        sentenceItemMiao[s] = {}
+                    }
+                sentenceMiao.push(sentenceItemMiao)
+                }
+                this.loading = false;
+                // 描红内容
+                for(let l=0; l< data.miaoRedBoxNumber; l++){
+                    for(let j=0; j<sentenceMiao.length; j++){
+                        sentenceArr.push(sentenceMiao[j])
                     }
                 }
-               sentenceMiao.push(sentenceItemMiao)
             }
-            this.loading = false;
-            for(let l=0; l< data.miaoRedBoxNumber; l++){
-                for(let j=0; j<sentenceMiao.length; j++){
-                    allArr.push(sentenceMiao[j])
+            // 书写内容
+            if(data.writeBoxNumber>0){
+                for(let w=0; w<Number(sentence)*Number(data.writeBoxNumber); w++){
+                    let sentenceItemWrite = []
+                    for(let j=0; j<data.rowNumber; j++){
+                        sentenceItemWrite.push({})
+                    }
+                    sentenceArr.push(sentenceItemWrite)
                 }
             }
-        //   let spltArr = item.con.split("");
-        //   let arr = [];
-        //   spltArr.forEach((item) => {
-        //     arr.push({ con: item });
-        //   });
-        //   //  如果不满一行则补满
-        //   if (arr.length % data.rowNumber != 0) {
-        //     let num = data.rowNumber - (arr.length % data.rowNumber);
-        //     for (let i = 0; i < num; i++) {
-        //       arr.push({});
-        //     }
-        //   }
-        //   console.log(arr);
+            sentenceArr = sentenceArr.slice(0,Number(sentence)*Number(data.writeBoxNumber))
+            sentenceArr.forEach((itemS,indexS)=>{
+                allArr.push(itemS)
+            })
         });
+        if(data.lastNullrow>0){
+            
+        }
         data.result = this.arrSplice(allArr, data.pageNumber);
         this.writeTableData = data
       }
@@ -775,7 +783,7 @@ export default {
       color: #000000;
     }
     .el-input__inner{
-        text-align: center;
+        text-align: right;
     }
   }
 }