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

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePaperItemPicker.vue

@@ -35,7 +35,7 @@
                   <Tag>{{ exersicesType[item.type] }}</Tag>
                   <!-- <Tag v-if="item.type === 'subjective'">{{ item.answerType }}</Tag> -->
                   <span>{{ index + 1 }}.</span>
-                  <span v-html="item.question">{{  }}</span>
+                  <span v-html="item.question"></span>
                 </div>
               </div>
             </div>

TEAMModelOS/ClientApp/src/view/iot/schooliot.vue

@@ -501,7 +501,7 @@ export default {
       };
       sheets.push(totalSheet);
       sheets.push(monthSheet);
-      let excelName = schoolName + "-" + periodName + "- iot" + this.$t('totalAnalysis.totalIndex.tab1')
+      let excelName = schoolName  + "- iot" + this.$t('totalAnalysis.totalIndex.tab1')
       excel.export_array_to_sheet(sheets, excelName);
     },
     isDateInRange(year, month, day, semesterInfo) {

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -1506,7 +1506,7 @@ namespace TEAMModelOS.Controllers
 
               await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(info, id.ToString(), new PartitionKey($"{scode}"));
                 
-                return Ok(new { code= 200, info = info });
+                return Ok(new { code= 200, info });
             }
             catch (Exception e)
             {