Merge branch 'develop' into TPE/Daniel

TEAMModelBI/Controllers/BICommon/BINoticeController.cs

@@ -1293,10 +1293,10 @@ namespace TEAMModelBI.Controllers.BICommon
             tmids = tmids.Union(tmids_school).ToList();
             tmids = tmids.Union(tmids_direct).ToList();
             tmids = tmids.Distinct().ToList();  //唯一化
-#if DEBUG //測試模式時限制TMID帳號，正式站佈署時不生效
-            List<string> filterTmid = new List<string>() { "1522758684", "1595321354", "1629875867" }; //"1522758684", "1595321354"
-            tmids = tmids.Intersect(filterTmid).ToList();
-#endif
+//#if DEBUG //測試模式時限制TMID帳號，正式站佈署時不生效
+//            List<string> filterTmid = new List<string>() { "1522758684", "1595321354", "1629875867" }; //"1522758684", "1595321354"
+//            tmids = tmids.Intersect(filterTmid).ToList();
+//#endif
 
             //取得TMID資料
             List<IdInfo> tmidInfos = new List<IdInfo>();

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/login/Admin.vue

@@ -86,7 +86,7 @@
                     <span>{{ deviceInfo.ip }}</span>
                 </el-form-item>
                 <el-form-item label="内存大小：">
-                    <span>{{ deviceInfo.server.shwoRam }}GB</span>
+                    <span>{{ deviceInfo.server.showRam }}GB</span>
                 </el-form-item>
                 <el-form-item label="处理器：">
                     <span v-for="(item, index) in deviceInfo.server.cpuInfos" :key="index" style="display: block;">{{ item.name }} {{ item.showHZ }}Hz({{ deviceInfo.server.cpu }}核)</span>
@@ -184,7 +184,7 @@ export default {
                         res.data.server.host.push(url)
                     })
                 })
-                res.data.server.shwoRam = (res.data.server.ram / 1024 / 1024 / 1024).toFixed(1)
+                res.data.server.showRam = (res.data.server.ram / 1024 / 1024 / 1024).toFixed(1)
                 res.data.server.cpuInfos.forEach(item => {
                     item.showHZ = item.hz ? (item.hz / 1000) : 0
                 });
@@ -308,7 +308,7 @@ export default {
                             res.data.server.host.push(url)
                         })
                     })
-                    res.data.server.shwoRam = (res.data.server.ram / 1024 / 1024 / 1024).toFixed(1)
+                    res.data.server.showRam = (res.data.server.ram / 1024 / 1024 / 1024).toFixed(1)
                     res.data.server.cpuInfos.forEach(item => {
                         item.showHZ = item.hz ? (item.hz / 1000) : 0
                     });
@@ -381,7 +381,7 @@ export default {
     width: 100%;
     height: 100%;
     background: #F4F7FF;
-    background-image: url(./background.jpg);
+    background-image: url(@/assets/image/background.jpg);
     background-repeat: no-repeat;
     background-attachment: fixed;
     background-position: 50%;

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/login/Student.vue

@@ -126,7 +126,7 @@ export default {
     height: 100%;
     background: #F4F7FF;
     position: relative;
-    background-image: url(./background.jpg);
+    background-image: url(@/assets/image/background.jpg);
     background-repeat: no-repeat;
     background-attachment: fixed;
     background-position: 50%;

TEAMModelOS.Function/IESServiceBusTrigger.cs

@@ -1768,7 +1768,7 @@ namespace TEAMModelOS.Function
                                             try {
                                                 foreach (var examData in examDatas)
                                                 {
-                                                    ResponseMessage responseMessage = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(examData.exam.id, new PartitionKey($"Exam-{owner}"));
+                                                    ResponseMessage responseMessage = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(examData.exam.id, new PartitionKey($"Exam-{lessonRecord.tmdid}"));
                                                     if (responseMessage.IsSuccessStatusCode)
                                                     {
                                                         ExamInfo examInfo = JsonDocument.Parse(responseMessage.Content).RootElement.ToObject<ExamInfo>();