|
@@ -132,7 +132,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="word_main" v-if="writeTableData&&writeTableData.result">
|
|
<div class="word_main" v-if="writeTableData&&writeTableData.result">
|
|
<div class="word_main_table" v-for="(itemT,indexT) in writeTableData.result" :key="indexT">
|
|
<div class="word_main_table" v-for="(itemT,indexT) in writeTableData.result" :key="indexT">
|
|
- <writeTable :dataConfig="writeTableData" :data="itemT" :pageNumber="indexT+1" :totalNumber="writeTableData.result.length" />
|
|
|
|
|
|
+ <writeTable :type="typeIndex" :dataConfig="writeTableData" :data="itemT" :pageNumber="indexT+1" :totalNumber="writeTableData.result.length" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -358,11 +358,15 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- allArr.push(JSON.parse(JSON.stringify(miaoArr)));
|
|
|
|
|
|
+ arrOption.push(JSON.parse(JSON.stringify(miaoArr)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- allArr.push(numrow)
|
|
|
|
|
|
+ arrOption.push(numrow)
|
|
|
|
+ arrOption = arrOption.slice(0,data.writeBoxNumber)
|
|
}
|
|
}
|
|
|
|
+ arrOption.forEach(itemA=>{
|
|
|
|
+ allArr.push(itemA)
|
|
|
|
+ })
|
|
}
|
|
}
|
|
});
|
|
});
|
|
if (data.lastNullrow) {
|
|
if (data.lastNullrow) {
|
|
@@ -386,6 +390,7 @@ export default {
|
|
let allArr = [];
|
|
let allArr = [];
|
|
data.option.forEach((item) => {
|
|
data.option.forEach((item) => {
|
|
let arr = [];
|
|
let arr = [];
|
|
|
|
+ let arrOption = []
|
|
// 拆分字和笔画为每一项
|
|
// 拆分字和笔画为每一项
|
|
arr.push({
|
|
arr.push({
|
|
con: item.con,
|
|
con: item.con,
|
|
@@ -447,11 +452,15 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- allArr.push(JSON.parse(JSON.stringify(miaoArr)));
|
|
|
|
|
|
+ arrOption.push(JSON.parse(JSON.stringify(miaoArr)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- allArr.push(numrow)
|
|
|
|
|
|
+ arrOption.push(numrow)
|
|
|
|
+ arrOption = arrOption.slice(0,data.writeBoxNumber)
|
|
}
|
|
}
|
|
|
|
+ arrOption.forEach(itemA=>{
|
|
|
|
+ allArr.push(itemA)
|
|
|
|
+ })
|
|
}
|
|
}
|
|
});
|
|
});
|
|
if (data.lastNullrow) {
|
|
if (data.lastNullrow) {
|
|
@@ -462,7 +471,7 @@ export default {
|
|
write: true,
|
|
write: true,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
- allArr.push(numrow);
|
|
|
|
|
|
+ allArr.push(JSON.parse(JSON.stringify(numrow)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
data.result = this.arrSplice(allArr, data.pageNumber);
|
|
data.result = this.arrSplice(allArr, data.pageNumber);
|
|
@@ -511,13 +520,13 @@ export default {
|
|
sentenceItemMiao[s] = {}
|
|
sentenceItemMiao[s] = {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- sentenceMiao.push(sentenceItemMiao)
|
|
|
|
|
|
+ sentenceMiao.push(JSON.parse(JSON.stringify(sentenceItemMiao)))
|
|
}
|
|
}
|
|
this.loading = false;
|
|
this.loading = false;
|
|
// 描红内容
|
|
// 描红内容
|
|
for(let l=0; l< data.miaoRedBoxNumber; l++){
|
|
for(let l=0; l< data.miaoRedBoxNumber; l++){
|
|
for(let j=0; j<sentenceMiao.length; j++){
|
|
for(let j=0; j<sentenceMiao.length; j++){
|
|
- sentenceArr.push(sentenceMiao[j])
|
|
|
|
|
|
+ sentenceArr.push(JSON.parse(JSON.stringify(sentenceMiao[j])))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -528,12 +537,12 @@ export default {
|
|
for(let j=0; j<data.rowNumber; j++){
|
|
for(let j=0; j<data.rowNumber; j++){
|
|
sentenceItemWrite.push({})
|
|
sentenceItemWrite.push({})
|
|
}
|
|
}
|
|
- sentenceArr.push(sentenceItemWrite)
|
|
|
|
|
|
+ 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))
|
|
sentenceArr.forEach((itemS,indexS)=>{
|
|
sentenceArr.forEach((itemS,indexS)=>{
|
|
- allArr.push(itemS)
|
|
|
|
|
|
+ allArr.push(JSON.parse(JSON.stringify(itemS)))
|
|
})
|
|
})
|
|
});
|
|
});
|
|
if(data.lastNullrow>0){
|
|
if(data.lastNullrow>0){
|
|
@@ -542,7 +551,7 @@ export default {
|
|
for(let j=0; j<data.rowNumber; j++){
|
|
for(let j=0; j<data.rowNumber; j++){
|
|
sentenceItemNull.push({})
|
|
sentenceItemNull.push({})
|
|
}
|
|
}
|
|
- allArr.push(sentenceItemNull)
|
|
|
|
|
|
+ allArr.push(JSON.parse(JSON.stringify(sentenceItemNull)))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
data.result = this.arrSplice(allArr, data.pageNumber);
|
|
data.result = this.arrSplice(allArr, data.pageNumber);
|