Merge branch 'debug-xxa' into 'master'

首页logo、指定菜单根据角色显示

See merge request spfm/spfm-market-front!83

src/components/p-header.vue

@@ -77,7 +77,22 @@ export default {
   },
   methods: {
       handleGoToCalendar(){
-        this.$router.push('calendar');
+          this.$http({
+              url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+              method: "post",
+              headers: {
+                  "Content-Type": "application/json",
+              },
+              data: {},
+          }).then((res) => {
+              console.log("header"+res.data[0].parentorgid)
+              if(res.data[0].parentorgid==='00440063000000000000'){
+                  this.$router.push('calendarnet');
+              }else{
+                  this.$router.push('calendar');
+              }
+          });
+
       },
     handleCall() {
       this.$switchTab(this, { rountPath: "/knowledgetop", name: "知识库" },'knowledgetop');

src/components/p-menu.vue

@@ -5,8 +5,9 @@
 		<el-menu class="el-menu-vertical-demo" :default-active="getDefaultActive" router :collapse="collapse"
 			@open="handleOpen" @close="handleClose" active-text-color="#71A6FD">
 			<div class="menu-logo" style="height: 60px; line-height: 60px">
-				<img width="95%" style="text-align: center; vertical-align: middle" src="../assets/newlogo.png"
-					alt="" />
+<!--                <img width="95%" style="text-align: center; vertical-align: middle" src="../assets/newlogo.png"-->
+<!--                     alt="" />-->
+                <img :src="parentorgid==='00440063000000000000' ? require('../assets/newlogo2.png') : require('../assets/newlogo.png')" width="95%" style="text-align: center; vertical-align: middle" alt=""/>
 			</div>
 			<!-- 引入组件 -->
 			<div class="menuScoll">
@@ -44,18 +45,20 @@
 		data() {
 			return {
 				defaultActiveMenuItem: {},
+                parentorgid: '',
 			};
 		},
 		mounted() {
 			if (this.data.length > 0) {
 				this.recursion(this.data);
 			}
+            this.getDept()
 		},
 		updated() {
 			if (this.data.length > 0) {
-			
+
 				this.recursion(this.data);
-				
+
 			}
 		},
 		methods: {
@@ -99,6 +102,19 @@
 				this.$store.commit("setDefaultActive", item.rountPath);
 				this.$store.commit("setTabList", Array.from(set));
 			},
+            getDept() {
+                this.$http({
+                    url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {},
+                }).then((res) => {
+                    console.log(res.data[0].parentorgid)
+                    this.parentorgid = res.data[0].parentorgid;
+                });
+            },
 		},
 	};
 </script>

src/pages/main/redir/redir.vue

@@ -29,7 +29,7 @@
 
                     console.log("目标页面中获取",this.$route.query.pass)
                     // 商户引入流程权限
-                    var url = 'https://ljh.ljsh.hl.10086.cn/manageapi/admin/api/v3/loginFromWork?account='+res.data[0].phoneNo+'&pass='+this.$route.query.pass;
+                    var url = 'https://10.149.15.69:8080/manageapi/admin/api/v3/loginFromWork?account='+res.data[0].phoneNo+'&pass='+this.$route.query.pass;
                     window.open(url);
                 });
             },

src/router/index.js

@@ -1111,6 +1111,12 @@ const routes = [{
         component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/fullcalendar/calendar'], resolve)
         },
         {
+            meta: { name: '信息技术中心日历', keepAlive: true },
+            path: '/calendarnet',
+            name: 'calendarnet',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/fullcalendar/calendarnet'], resolve)
+        },
+        {
             meta: { name:  '公告', keepAlive: false },
             path: '/noticec',
             name: 'noticec',