|
@@ -815,8 +815,8 @@
|
|
|
name: this.getPeriodInfo(this.evaluationInfo.school).name
|
|
name: this.getPeriodInfo(this.evaluationInfo.school).name
|
|
|
},
|
|
},
|
|
|
grades: this.gradeChoose,
|
|
grades: this.gradeChoose,
|
|
|
- subjects: this.getPaperInfo(this.evaluationInfo.papers).subject,
|
|
|
|
|
- papers: this.getPaperInfo(this.evaluationInfo.papers).paper,
|
|
|
|
|
|
|
+ subjects: this.getPaperInfo(this.evaluationInfo.papers, this.evaluationInfo.paperInfo).subject,
|
|
|
|
|
+ papers: this.getPaperInfo(this.evaluationInfo.papers, this.evaluationInfo.paperInfo).paper,
|
|
|
examType: {
|
|
examType: {
|
|
|
id: this.evaluationInfo.examType,
|
|
id: this.evaluationInfo.examType,
|
|
|
name: this.getexamTypeName(this.evaluationInfo.examType)
|
|
name: this.getexamTypeName(this.evaluationInfo.examType)
|
|
@@ -861,12 +861,15 @@
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- getPaperInfo(data) {
|
|
|
|
|
|
|
+ getPaperInfo(data,rule) {
|
|
|
if (data.length !== 0) {
|
|
if (data.length !== 0) {
|
|
|
let info = {
|
|
let info = {
|
|
|
subject: [],
|
|
subject: [],
|
|
|
paper: []
|
|
paper: []
|
|
|
}
|
|
}
|
|
|
|
|
+ for (let rules of rule) {
|
|
|
|
|
+ paper.multipleRule = item.multipleRule
|
|
|
|
|
+ }
|
|
|
for (let item of data) {
|
|
for (let item of data) {
|
|
|
let sub = {}
|
|
let sub = {}
|
|
|
let paper = {}
|
|
let paper = {}
|
|
@@ -880,6 +883,7 @@
|
|
|
paper.ans = []
|
|
paper.ans = []
|
|
|
paper.point = []
|
|
paper.point = []
|
|
|
console.log(item.scoring)
|
|
console.log(item.scoring)
|
|
|
|
|
+
|
|
|
for (let i = 0; i < item.scoring.length; i++) {
|
|
for (let i = 0; i < item.scoring.length; i++) {
|
|
|
paper.ans.push(item.scoring[i].ans)
|
|
paper.ans.push(item.scoring[i].ans)
|
|
|
paper.point.push(item.scoring[i].score)
|
|
paper.point.push(item.scoring[i].score)
|
