|
@@ -2489,9 +2489,13 @@ export default {
|
|
|
let kpl = this.tableWorksArray[kin].array
|
|
|
// console.log('kpl',this.tableWorksArray[kin]);
|
|
|
|
|
|
- for (let index = 0; index < kpl.length; index++) {
|
|
|
+ for (let index = 0; index < kpl.length; index++) {
|
|
|
if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title +':'+ '')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.file && kpl[index].json.file[0].url) {
|
|
@@ -2500,13 +2504,19 @@ export default {
|
|
|
userWork.push(kpl[index].json.title+':' + _fileid.join('、'))
|
|
|
}
|
|
|
if (kpl[index].type == 7 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title+':'+'')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 1 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
let kk = []
|
|
|
- kpl[index].json.answer2.forEach((e)=>{
|
|
|
- kk.push(kpl[index].json.array[e].option)
|
|
|
- })
|
|
|
+ if (kpl[index].json && kpl[index].json.answer2 && kpl[index].json.answer2.length) {
|
|
|
+ kpl[index].json.answer2.forEach((e)=>{
|
|
|
+ kk.push(kpl[index].json.array[e].option)
|
|
|
+ })
|
|
|
+ }
|
|
|
userWork.push(kpl[index].json.title+':' +kk.join(','))
|
|
|
}
|
|
|
}
|
|
@@ -2694,7 +2704,11 @@ ${JSON.stringify(forAllList)}
|
|
|
|
|
|
for (let index = 0; index < kpl.length; index++) {
|
|
|
if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title +':'+ '')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.file && kpl[index].json.file[0].url) {
|
|
@@ -2703,13 +2717,19 @@ ${JSON.stringify(forAllList)}
|
|
|
userWork.push(kpl[index].json.title+':' + _fileid.join('、'))
|
|
|
}
|
|
|
if (kpl[index].type == 7 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title+':'+'')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 1 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
let kk = []
|
|
|
- kpl[index].json.answer2.forEach((e)=>{
|
|
|
- kk.push(kpl[index].json.array[e].option)
|
|
|
- })
|
|
|
+ if (kpl[index].json && kpl[index].json.answer2 && kpl[index].json.answer2.length) {
|
|
|
+ kpl[index].json.answer2.forEach((e)=>{
|
|
|
+ kk.push(kpl[index].json.array[e].option)
|
|
|
+ })
|
|
|
+ }
|
|
|
userWork.push(kpl[index].json.title+':' +kk.join(','))
|
|
|
}
|
|
|
}
|
|
@@ -2920,12 +2940,12 @@ ${JSON.stringify(forAllList)}
|
|
|
let scoArr = []
|
|
|
// 新添加的评分
|
|
|
const ids1 = this.scoList.map(item => item.id);
|
|
|
- console.log('ids1',ids1);
|
|
|
+ // console.log('ids1',ids1);
|
|
|
|
|
|
// jiu评分
|
|
|
scoArr = this.scoListCopy.filter(item => !ids1.includes(item.id));
|
|
|
- console.log('scoArr',JSON.parse(JSON.stringify('scoArr')));
|
|
|
-
|
|
|
+ // console.log('scoArr',JSON.parse(JSON.stringify('scoArr')));
|
|
|
+
|
|
|
|
|
|
scoArr = [...this.scoList,...scoArr]
|
|
|
|