Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

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

@@ -441,11 +441,6 @@ export default {
             }
         },
         getStudentStatus(stu) {
-            // 去掉作答状态
-            // if (!stu || !stu.ansBlob || stu.ansBlob.length == 0) {
-            //     return 1
-            // } 
-            // else 
             if (!stu) {
                 return 1
             } else if (stu.data && stu.data.includes(-1)) {
@@ -679,7 +674,7 @@ export default {
                     students: groupInfo.members,
                     id: this.chooseClass
                 }
-                this.$set(this.paperInfo[this.chooseClass], "students", classStu)
+                // this.$set(this.paperInfo[this.chooseClass], "students", classStu)
                 this.students = []
                 this.studentScore = []
                 this.tableColumn = [...this.scoreList]
@@ -776,6 +771,11 @@ export default {
                     if (res.examClassResults && res.examClassResults.length) {
                         if (this.timer) clearInterval(this.timer)
                         this.paperInfo[this.chooseClass]["studentAns"] = res.examClassResults[0]
+                        let classStu = {
+                            students: res.ufos,
+                            id: this.chooseClass
+                        }
+                        this.$set(this.paperInfo[this.chooseClass], "students", classStu) //使用评测返回的名单信息代替原来从名单获取信息
                         this.setTableData()
                         if (res.examClassResults[0]) {
                             this.calcOverView(res.examClassResults[0])
@@ -817,6 +817,7 @@ export default {
         setTableData() {
             if (this.paperInfo[this.chooseClass] && this.paperInfo[this.chooseClass]["students"] && this.paperInfo[this.chooseClass]["studentAns"]) {
                 let studentData = this.paperInfo[this.chooseClass]["students"]
+                console.log(this.paperInfo)
                 let studentAns = this.paperInfo[this.chooseClass]["studentAns"]
                 this.studentScore = []
                 this.tableColumn = [...this.scoreList]