Merge branch 'develop' into TPE/develop

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -1611,7 +1611,7 @@
 			},
 			isShowActi() {
 				// 测试站、RC站、正式站的(研发、醍摩豆、南特师)及对应区级
-				return this.$store.state.config.srvAdrType === "test" || (this.$store.state.config.srvAdrType === "rc" && this.$store.state.config.srvAdr === "China") || (this.$store.state.config.srvAdrType === "product" && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn" || this.$store.state.userInfo.schoolCode === "njtsjy" || this.$store.state.userInfo.schoolCode === 'ntszhxx'));
+				return this.$store.state.config.srvAdrType === "test" || (this.$store.state.config.srvAdrType === "rc" && this.$store.state.config.srvAdr === "China") || (this.$store.state.config.srvAdrType === "product" && this.$store.state.config.srvAdr === "China" && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn" || this.$store.state.userInfo.schoolCode === "njtsjy" || this.$store.state.userInfo.schoolCode === 'ntszhxx'));
 			}
 		},
 

TEAMModelOS/ClientApp/src/view/areaMgmt/AreaLayout.vue

@@ -623,7 +623,7 @@
 			isShowActi() {
 				// 测试站、RC站、正式站的(南特师、温江)及对应区级
 				return this.$store.state.config.srvAdrType === "test" || (this.$store.state.config.srvAdrType === "rc" && this.$store.state.config.srvAdr === 'China') ||
-					(this.$store.state.config.srvAdrType === "product" && (this.areaId === '69e3d413-50a1-4f5e-844a-e0f7c9622ea3' || this.areaId === '02944f32-f534-3397-ea56-e6f1fc6c3714' || this.areaId === '2c063f8f-f5cd-4f24-8f84-82dae0151e4d' || this.areaId === 'd5771714-5b2e-48df-add6-5d5bf16c4de8' || this.areaId === '941436f4-dee3-460c-bbda-5392c6dd36fa'))
+					(this.$store.state.config.srvAdrType === "product" && this.$store.state.config.srvAdr === 'China' && (this.areaId === '69e3d413-50a1-4f5e-844a-e0f7c9622ea3' || this.areaId === '02944f32-f534-3397-ea56-e6f1fc6c3714' || this.areaId === '2c063f8f-f5cd-4f24-8f84-82dae0151e4d' || this.areaId === 'd5771714-5b2e-48df-add6-5d5bf16c4de8' || this.areaId === '941436f4-dee3-460c-bbda-5392c6dd36fa'))
 			}
 		},
 		created() {