Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/learnactivity/tabs/CloudDAS.vue

@@ -80,12 +80,13 @@ export default {
     }
   },
   created() {
-    console.log(this.evInfo)
     this.initAnalysisJson(this.evInfo)
   },
   methods: {
     initAnalysisJson(evInfo) {
-      if (evInfo.progress !== 'finish') {
+      console.error(evInfo)
+      // 如果评测活动还没有结束 或者 cloudas为false 则不显示诊断分析数据
+      if (evInfo.progress !== 'finish' || !evInfo.cloudas) {
         this.showAnalysis = true
         this.isEmpty = true
         return

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -470,7 +470,7 @@ namespace TEAMModelOS.Controllers
             {
                 if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 var client = _azureCosmos.GetCosmosClient();
-                StringBuilder stringBuilder = new($"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes, c.stuLists, c.sRate,c.lostStu,c.sStatus,c.qamode,c.school from c where (c.status<>404 or IS_DEFINED(c.status) = false) ");
+                StringBuilder stringBuilder = new($"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes, c.stuLists, c.sRate,c.lostStu,c.sStatus,c.qamode,c.school,c.cloudas from c where (c.status<>404 or IS_DEFINED(c.status) = false) ");
                 if (request.TryGetProperty("classIds", out JsonElement classIds))
                 {
                     List<string> ids = classIds.ToObject<List<string>>();