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

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -736,7 +736,7 @@
 									permission: "dashboard-read",
 									menuName: "TeacherDashboard",
 									child: [],
-									isShow: this.isGlobalSiteRc && this.isAdmin
+                                    isShow: this.isGlobalSite && this.isAdmin
 									//isShow:true,
 								},
 								// 学校管理

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

@@ -251,6 +251,9 @@ export default {
       this.$refs.side1.toggleCollapse()
       this.$EventBus.$emit('onCollapseChange', this.isCollapsed)
     },
+    isGlobalSite() {
+        return this.$store.state.config.srvAdr !== "China";
+    },
     /*是否为国际测试rc*/
 			isGlobalSiteRc() {
 				if (window.location.host.includes("ies5-rc.teammodel.net")) {
@@ -277,7 +280,7 @@ export default {
           permission: '',
           menuName: 'areaIndex',
           child: [],
-          isShow: !this.$jsFn.checkJinNiu() && !this.$jsFn.checkTrain() && this.$store.state.config.srvAdrType != 'product'
+          isShow: !this.$jsFn.checkJinNiu() && !this.$jsFn.checkTrain()
         },
         //学区iot
         {
@@ -289,7 +292,7 @@ export default {
           permission: '',
           menuName: 'areaiot',
           child: [],
-          isShow: !this.$jsFn.checkJinNiu() && !this.$jsFn.checkTrain() && this.$store.state.config.srvAdrType != 'product' && this.isGlobalSiteRc()
+          isShow: !this.$jsFn.checkJinNiu() && !this.$jsFn.checkTrain() && this.isGlobalSite()
           //isShow:true,
         },
         // 研修平台