From 811e80a27ccab17351dff7ac8057f7e1df8430c8 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Tue, 18 Oct 2022 15:14:50 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/mixins/view-module.js | 1 - back/src/router/index.js | 2 +- back/src/views/main-sidebar.vue | 99 +- .../views/modules/devtools/generator-menu.vue | 13 +- .../views/modules/sys/menu-add-or-update.vue | 3 +- back/src/views/modules/sys/menu.vue | 7 + front/src/store/modules/user.js | 7 + front/src/views/home/apply.vue | 1660 +++++++++-------- 8 files changed, 972 insertions(+), 820 deletions(-) diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index 98b075fb..edd9378c 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -107,7 +107,6 @@ export default { } else { this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 } - console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL) if (this.dataList[0].type === '组件服务') { this.dataList.map(val => { diff --git a/back/src/router/index.js b/back/src/router/index.js index c386dc1b..08f69ea5 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => { Vue.prototype.$message.error(res.msg) return next({ name: 'login' }) } - window.SITE_CONFIG.menuList = res.data + window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0) fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList) next({ ...to, replace: true }) }).catch(() => { diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue index 40f882b0..66f28d04 100644 --- a/back/src/views/main-sidebar.vue +++ b/back/src/views/main-sidebar.vue @@ -1,8 +1,8 @@ @@ -25,7 +25,7 @@ :menu="menu" > sdddd - + @@ -35,63 +35,64 @@ \ No newline at end of file + diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue index ed7ddd49..318254cb 100644 --- a/back/src/views/modules/sys/menu-add-or-update.vue +++ b/back/src/views/modules/sys/menu-add-or-update.vue @@ -123,11 +123,12 @@ export default { }, // 获取菜单列表 getMenuList () { + console.log('获取菜单位置2') return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } - this.menuList = res.data + this.menuList = res.data.filter(item => item.site === 0) }).catch(() => {}) }, // 获取信息 diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue index 4fe46da1..bbc70ae3 100644 --- a/back/src/views/modules/sys/menu.vue +++ b/back/src/views/modules/sys/menu.vue @@ -1,3 +1,10 @@ +