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

TEAMModelOS/ClientApp/src/view/learnactivity/CreateEvaluation.vue

@@ -867,26 +867,22 @@
                         subject: [],
                         paper: []
                     }
-                    for (let rules of rule) {
-                        paper.multipleRule = item.multipleRule
-                    }
-                    for (let item of data) {
+                    for (let i = 0; i < data.length; i++) {
                         let sub = {}
                         let paper = {}
-                        sub.id = item.subjectId
-                        sub.name = item.subjectName
-                        paper.id = item.id
-                        paper.code = item.code
-                        paper.name = item.name
-                        paper.blob = item.blob
-                        paper.scope = item.scope
+                        sub.id = data[i].subjectId
+                        sub.name = data[i].subjectName
+                        paper.id = data[i].id
+                        paper.code = data[i].code
+                        paper.name = data[i].name
+                        paper.blob = data[i].blob
+                        paper.scope = data[i].scope
+                        paper.multipleRule = rule[i].multipleRule
                         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)
+                        for (let k = 0; k < data[i].scoring.length; k++) {
+                            paper.ans.push(data[i].scoring[k].ans)
+                            paper.point.push(data[i].scoring[k].score)
                         }
                         info.subject.push(sub)
                         info.paper.push(paper)

TEAMModelOS/Models/SchoolInfo/ExamInfo.cs

@@ -90,7 +90,7 @@ namespace TEAMModelOS.Models.SchoolInfo
         public string name { get; set; }
         public string blob { get; set; }
         public string scope { get; set; }
-        public string multipleRule { get; set; }
+        public int multipleRule { get; set; }
         //该试卷配分情况
         public List<double> point { get; set; }
         public List<List<string>> ans { get; set; }