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

TEAMModelOS.SDK/Models/Cosmos/Common/ExamClassResult.cs

@@ -31,7 +31,7 @@ namespace TEAMModelOS.SDK.Models
         public List<List<string>> studentAnswers { get; set; }
         public List<List<double>> studentScores { get; set; }
         //Åú×¢
-        public List<string> annotation { get; set; }
+        public List<string> mark { get; set; }
         public string scope { get; set; }
         public List<double> sum { get; set; }
         public double average { get; set; }

TEAMModelOS/ClientApp/src/common/BaseMyCanvas.vue

@@ -111,6 +111,7 @@
 		},
 		created() {
 			this.initBgImg()
+			this.vm = Object.keys(this.vm).length ?  this.vm : this
 		},
 		methods: {
 			// 移入
@@ -161,6 +162,11 @@
 			
 			undo(){
 				this.$refs.SignCanvas.doUndo();
+				if (this.bgImg) {
+					this.$nextTick(() => {
+						this.$refs.SignCanvas.doRenderImg(this.bgImg)
+					})
+				}
 			},
 			
 			/**

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -1008,7 +1008,7 @@ namespace TEAMModelOS.Controllers
                         }
                     }
                 }
-                var queryAnswers = $"select c.id,c.code,c.studentIds,c.subjectId,c.studentAnswers,c.studentScores,c.sum,c.annotation from c where c.examId ='{id}' and array_contains(c.studentIds,'{studentId}') and c.pk = 'ExamClassResult' ";
+                var queryAnswers = $"select c.id,c.code,c.studentIds,c.subjectId,c.studentAnswers,c.studentScores,c.sum,c.mark from c where c.examId ='{id}' and array_contains(c.studentIds,'{studentId}') and c.pk = 'ExamClassResult' ";
                 List<ExamClassResult> answers = new List<ExamClassResult>();
                 await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: queryAnswers,
                     requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ExamClassResult-{school}") }))