Browse Source

Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

liqk 4 years ago
parent
commit
8a1de9dd7c
1 changed files with 7 additions and 3 deletions
  1. 7 3
      TEAMModelOS/ClientApp/src/view/learnactivity/CreateEvaluation.vue

+ 7 - 3
TEAMModelOS/ClientApp/src/view/learnactivity/CreateEvaluation.vue

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