diff --git a/src/components/Header.vue b/src/components/Header.vue index f198717..f853da7 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -55,15 +55,22 @@ export default { popoverValue: false } }, + props:{ + menuAllDate:{ + type:Array + } + }, computed: { ...mapGetters({ menuData: 'menuData' }), isSystemManager () { - return this.menuData.some(menu => menu.id === 'AVL9YSB7ZF') + console.log(this.menuData,"this.menuData") + return this.menuAllDate.some(menu => menu.id === 'AVL9YSB7ZF') }, isSystemManagerBelong () { - return this.menuData.some(menu => menu.id === 'AVL9YSB7ZF' && menu.belong == 1) + console.log(this.menuData,"isSystemManager") + return this.menuAllDate.some(menu => menu.id === 'AVL9YSB7ZF' && menu.belong == 1) } }, methods: { @@ -77,9 +84,6 @@ export default { this.$api.login.logout().then(_ => { this.$message.success('退出成功') this.$store.commit('saveUserInfo', null) - this.$store.commit('savePathUrl', null) - this.$store.commit('saveMenuName', null) - this.$store.commit('saveMenuData', null) this.$store.commit('setHandleProcess', null) // var sevice = "http://"+window.location.host+"/"; // var serviceUrl = encodeURIComponent(sevice); diff --git a/src/utils/request.js b/src/utils/request.js index ce4c35d..d8d8bc2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,8 +89,6 @@ instance.interceptors.response.use(function (response) { store.commit('saveUserInfo', null) store.commit('saveUserInfo', null) store.commit('savePathUrl', null) - store.commit('saveMenuName', null) - store.commit('saveMenuData', null) store.commit('setHandleProcess', null) router.push('/login') Message.error('登录超时过期') @@ -106,8 +104,6 @@ instance.interceptors.response.use(function (response) { store.commit('saveUserInfo', null) store.commit('saveUserInfo', null) store.commit('savePathUrl', null) - store.commit('saveMenuName', null) - store.commit('saveMenuData', null) store.commit('setHandleProcess', null) router.push('/login') Message.error('登录超时过期') diff --git a/src/views/Layout.vue b/src/views/Layout.vue index ed38b00..0c58e73 100644 --- a/src/views/Layout.vue +++ b/src/views/Layout.vue @@ -1,8 +1,7 @@