Merge branch 'develop5.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

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

@@ -105,16 +105,16 @@ export default {
         initMenu() {
             // 区级菜单
             this.areaMenu = [
-                {
-                    icon: 'iconfont icon-shujufenxi',
-                    name: '区级数据',
-                    router: '/area/areaMgmt',
-                    tag: '',
-                    role: '',
-                    permission: '',
-                    menuName: 'areaMgmt',
-                    child: []
-                },
+                // {
+                //     icon: 'iconfont icon-shujufenxi',
+                //     name: '区级数据',
+                //     router: '/area/areaMgmt',
+                //     tag: '',
+                //     role: '',
+                //     permission: '',
+                //     menuName: 'areaMgmt',
+                //     child: []
+                // },
 				{
 				    icon: 'iconfont icon-policy',
 				    name: '区级设置',
@@ -124,7 +124,7 @@ export default {
 				    permission: '',
 				    menuName: 'areaSetting',
 				    child: [],
-				    isShow: true
+				    isShow: this.$store.state.config.srvAdr == 'China'
 				},
                 {
                     icon: 'iconfont icon-policy',
@@ -135,7 +135,7 @@ export default {
                     permission: '',
                     menuName: 'policy',
                     child: [],
-                    isShow: true
+                    isShow: this.$store.state.config.srvAdr == 'China'
                 },
                 {
                     icon: 'iconfont icon-basic-setting',
@@ -168,7 +168,7 @@ export default {
 				    permission: '',
 				    menuName: 'spotCheck',
 				    child: [],
-                    isShow: true
+                    isShow: this.$store.state.config.srvAdr == 'China'
 				},
                 {
                     icon: 'iconfont icon-vote',
@@ -179,7 +179,7 @@ export default {
                     permission: '',
                     menuName: 'manageAreaVote',
                     child: [],
-                    isShow: true && this.checkHost()
+                    isShow: true
                 },
                 {
                     icon: 'iconfont icon-questionnaire',
@@ -190,7 +190,7 @@ export default {
                     permission: '',
                     menuName: 'manageAreaQuestionnaire',
                     child: [],
-                    isShow: true && this.checkHost()
+                    isShow: true 
                 },
 				{
 				    icon: 'iconfont icon-questionnaire',
@@ -201,7 +201,7 @@ export default {
 				    permission: '',
 				    menuName: 'areaAbilityMgmt',
 				    child: [],
-                    isShow: true
+                    isShow: this.$store.state.config.srvAdr == 'China'
 				},
                 {
 				    icon: 'iconfont icon-questionnaire',
@@ -212,7 +212,7 @@ export default {
 				    permission: '',
 				    menuName: 'areaRes',
 				    child: [],
-                    isShow: true
+                    isShow: this.$store.state.config.srvAdr == 'China'
 				},
                 // {
 				//     icon: 'iconfont icon-questionnaire',

TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.vue

@@ -182,6 +182,7 @@
                             </div>
                             <div class="basicInfo">
                                 <h3>{{searchInfo.name}}</h3>
+                                <p>{{searchInfo.id}}</p>
                                 <p>{{searchInfo.email}}</p>
                             </div>
                             <div class="serchInfo-btns">