diff --git a/src/router/index.js b/src/router/index.js index 31c6e15..6a0bc31 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -22,7 +22,9 @@ export const constantRoutes = [ }, { path: '/', - redirect: '/privilegeManagement1' + redirect: '/welcome/index' + // component: () => import('@/views/welcome/index'), + // hidden: true }, require("./modules/privilegeManagement.js").default, require("./menus/index.js").default, @@ -35,6 +37,7 @@ export const constantRoutes = [ require("./menus/approval.js").default, require("./menus/system.js").default, require("./menus/department.js").default, + require("./menus/welcome.js").default, require("./menus/others.js").default, { path: '*', redirect: '/404', hidden: true }, // { diff --git a/src/router/menus/welcome.js b/src/router/menus/welcome.js new file mode 100644 index 0000000..e61f0c1 --- /dev/null +++ b/src/router/menus/welcome.js @@ -0,0 +1,19 @@ +import Layout from '@/views/layout/Layout' + +const welcome = { + path: '/welcome', + component: Layout, + code: 'XXXX', + meta: {title: '欢迎', icon: '', noCache: true, affix: false}, + children: [ + { + path: '/welcome/index', + component: () => import('@/views/welcome/index'), + name: '欢迎', + code: '0000', + meta: {title: '欢迎', noCache: false, affix: false} + }, + ] +}; + +export default welcome diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index a5672de..68ca52c 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -27,7 +27,7 @@ export default { watch: { '$route.path'() { setTimeout(() => { - this.showBtn() + this.getPerList() },500) } }, @@ -78,13 +78,12 @@ export default { relation: false, reset: false, } + console.log('list: ', list); for(var i = 0; i < perList.length; i++) { if(perList[i][1] === code) { + console.log('perList[i]: ', perList[i]); list[perList[i][2]] = true; } - // if(perList[i][2] === 'reset') { - // console.log('perList[i]: ', perList[i]); - // } } this.setShowBtnList(list) }, diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 06d17e5..806feb9 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -13,7 +13,8 @@ @@ -102,6 +103,7 @@ export default { return path.resolve(this.basePath, routePath) }, storageCode(code){ + console.log('code: ', code); localStorage.setItem('code', code) }, // 判断当前菜单是否显示 diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue new file mode 100644 index 0000000..32fafa2 --- /dev/null +++ b/src/views/welcome/index.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/views/welcome/welcome.png b/src/views/welcome/welcome.png new file mode 100644 index 0000000..b0b9ff3 Binary files /dev/null and b/src/views/welcome/welcome.png differ