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

TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs

@@ -195,7 +195,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                         foreach (ExamSubject subject in info.subjects)
                                         {
                                             string classCode = string.Empty;
-                                            string cname = string.Empty;
+                                            string? cname = string.Empty;
                                             if (string.IsNullOrEmpty(info.school) || !info.scope.Equals("school", StringComparison.OrdinalIgnoreCase))
                                             {
                                                 classCode = "ExamClassResult-" + info.creatorId;

TEAMModelOS/ClientApp/src/view/evaluation/bank/index.vue

@@ -374,7 +374,8 @@
 			},
 			/* 判断是否为国际站 */
 			inGlobalSite() {
-				return localStorage.getItem("location") === "Global";
+				// return localStorage.getItem("location") === "Global";
+				return this.$store.state.config.srvAdr === 'Global'
 			},
 			hasXkwAuth() {
 				// if (localStorage.school_profile) {
@@ -386,7 +387,7 @@
 				return true;
 			},
 			isTestSite() {
-				return this.$store.state.config.srvAdrType === "test" || ((this.$store.state.config.srvAdrType === "product" || this.$store.state.config.srvAdrType === "rc") && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn") && this.$store.state.config.srvAdr === 'China')
+				return (this.$store.state.config.srvAdrType === "test" && this.$store.state.config.srvAdr === 'China') || ((this.$store.state.config.srvAdrType === "product" || this.$store.state.config.srvAdrType === "rc") && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn") && this.$store.state.config.srvAdr === 'China')
 			}
 		},
 		beforeRouteLeave(to, from, next) {

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

@@ -3,7 +3,7 @@
         <div>
             <div>
                 <div class="exersices-content">
-                    <IconText :text="$t('evaluation.connector') + $t('evaluation.newExercise.stem')" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
+                    <IconText :text="$t(`evaluation.${exersicesType}`) + $t('evaluation.newExercise.stem')" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
                     <p v-html="editInfo.question"></p>
                 </div>
                 <div class="exersices-option" ref="optionRefs">