|
@@ -2490,7 +2490,7 @@ export default {
|
|
|
// console.log('kpl',this.tableWorksArray[kin]);
|
|
|
|
|
|
for (let index = 0; index < kpl.length; index++) {
|
|
|
- if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
+ if ((kpl[index].type == 3 || kpl[index].type == 13 || kpl[index].type ==8) && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.answer2) {
|
|
|
userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
}else{
|
|
@@ -2521,7 +2521,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
let info = [
|
|
|
- this.cueWord.fieldList.includes('序号') ? '序号' + (kin + 1) : '',
|
|
|
+ this.cueWord.fieldList.includes('序号') ? '序号:' + (kin + 1) : '',
|
|
|
this.cueWord.fieldList.includes('提交人') ? '提交人:' + this.tableWorksArray[kin].name : '',
|
|
|
this.cueWord.fieldList.includes('学段') ? '学段:' + this.getTType(this.teaType[0].id, this.tableWorksArray[kin].cclassid) : '',
|
|
|
this.cueWord.fieldList.includes('年级') ? '年级:' + this.getTType(this.teaType[1].id, this.tableWorksArray[kin].cclassid) : '',
|
|
@@ -2703,7 +2703,7 @@ ${JSON.stringify(forAllList)}
|
|
|
// console.log('kpl',this.TabArr[kin]);
|
|
|
|
|
|
for (let index = 0; index < kpl.length; index++) {
|
|
|
- if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
+ if ((kpl[index].type == 3 || kpl[index].type == 13 || kpl[index].type ==8) && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.answer2) {
|
|
|
userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
}else{
|
|
@@ -2734,7 +2734,7 @@ ${JSON.stringify(forAllList)}
|
|
|
}
|
|
|
}
|
|
|
let info = [
|
|
|
- this.cueWord.fieldList.includes('序号') ? '序号' + (kin + 1) : '',
|
|
|
+ this.cueWord.fieldList.includes('序号') ? '序号:' + (kin + 1) : '',
|
|
|
this.cueWord.fieldList.includes('提交人') ? '提交人:' + TabArr[kin].name : '',
|
|
|
this.cueWord.fieldList.includes('学段') ? '学段:' + this.getTType(this.teaType[0].id, TabArr[kin].cclassid) : '',
|
|
|
this.cueWord.fieldList.includes('年级') ? '年级:' + this.getTType(this.teaType[1].id, TabArr[kin].cclassid) : '',
|