diff --git a/src/App.vue b/src/App.vue index e7c1bb1feb041db1f7df025f9721f3a6a67dc8af..9a6554b9038099e36bc34130174134ede58106a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -60,11 +60,10 @@ export default { }, nowParent(){ if(this.pageShow&&this.$store.state.userInfo){ - console.log(2222222) - console.log(this.navMenu) - // return this.navMenu[this.rowPath.slice(1,4)] - // return this.pathToData(this.navMenu,this.rowPath) - return this.navMenu[1] + // console.log(2222222) + // console.log(this.navMenu) + // console.log(this.rowPath) + return this.navMenu[this.rowPath.slice(1,2)] }else{ return '' diff --git a/src/components/bg-menu.vue b/src/components/bg-menu.vue index 8f6252d488cd400c0e738973a443d52bca9128c6..f0a0edac63674aa6c7de47fee1bdfd436477e6d9 100644 --- a/src/components/bg-menu.vue +++ b/src/components/bg-menu.vue @@ -15,7 +15,7 @@ -
+
@@ -45,16 +45,17 @@
-
+
- + + - - {{ userInfo.name || userInfo.user }} + + {{ userInfo.system_account || userInfo.system_id }} @@ -62,9 +63,9 @@ 请登录
-
+
{ + if(e.menuType=='manager'){ + temp.push(e) + } + }); + return temp } }) @@ -201,18 +210,13 @@ export default { let path = this.$route.path; window.location.href = `/login?redirect=${path}`; } else { - //true 同区域跳转 - //false 跨系统跳转 - if(parent.menuType==this.$store.state.menuObj[this.path].menuType){ - this.$router.push(n); + //是否有子路由，有则寻找子路由的第一个进行跳转，无则直接进行跳转 + //使用childMenuAction是模拟template中，子路径点击跳转使用childMenuAction， + //防止出现层级错误的问题 + if(parent.children&&parent.children.length){ + this.childMenuAction(parent.children[0],parent) }else{ - let temp = '' - if(this.$store.state.menuObj[n].menuType=='font'||this.$store.state.menuObj[n].menuType=='system'){ - temp = '/apaas/ui/#' - }else if(this.$store.state.menuObj[n].menuType=='manager'){ - temp = '/apaas/system/ui/#' - } - window.location.href = temp+n + this.pathToUrl(n,parent) } } }, @@ -238,17 +242,16 @@ export default { if(path.includes('http')){ window.open(path,'_blank') }else{ - debugger //判断是否是同区域内跳转 //非同区域跳转需要改前缀，如apaas/ui跳转到apaas/manager - if(parent.menuType==this.$store.state.menuObj[this.path].menuType){ + if(this.$store.state.menuObj[this.path]&&parent.menuType==this.$store.state.menuObj[this.path].menuType){ this.$router.push(path); }else{ let temp = '' if(this.$store.state.menuObj[path].menuType=='font'||this.$store.state.menuObj[path].menuType=='system'){ - temp = '/apaas/ui/#' + temp = '/apaas/portal/ui/#' }else if(this.$store.state.menuObj[path].menuType=='manager'){ - temp = '/apaas/system/ui/#' + temp = '/apaas/manage/ui/#' } window.location.href = temp+path } diff --git a/src/page/login/index.vue b/src/page/login/index.vue index e9af295b9c40fe697fe7c1dfbc09991f784af611..03fc8bc11e44b10c7d6e2e0e1551547b93dd5b12 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -90,7 +90,9 @@ export default { this.$store.commit('setMenuObj',menuObj) // } generateRoutes() - this.$router.push("/"); + // this.$router.push("/"); + //跳转到工作台页面 + window.location.href = '/apaas/portal/ui/#/' } }); }, diff --git a/src/router/function.js b/src/router/function.js index 690f41a7ad9704d8e452df672b75839ec7591886..e5e8f6922cac204509ccb199c7c6d41f33798b7a 100644 --- a/src/router/function.js +++ b/src/router/function.js @@ -6,7 +6,6 @@ var adminMenu = [ name:"workspace", menuType:'system', //system:apaas后管,能力注册页等 font:apaas前台页 manager:apaas管理中心 show:true, - level:1, children:[{ menuName: "能力管理", path: "/ability-manage", @@ -154,148 +153,143 @@ var adminMenu = [ } ] }, - - { - menuName: "管理中心", - path: "/manage", - name:"manage", - parentPath:null, - menuType:'manager', - show: true, - level:1, - children:[{ - menuName: "开发管理", - path: "/develop", +{ + name:"index", + menuName:"首页", + path: "/", + parentPath:null, + menuType:'font', + show:true, +}, +{ + menuName: "管理中心", + path: "/manage", + name:"manage", + parentPath:null, + menuType:'manager', + show: true, + children:[{ + menuName: "开发管理", + path: "/develop", + parentPath:null, + menuType:'manager', + show:true, + icon: "#bg-ic-ability", + children:[ + { + name: "account-manage", + menuName:'系统账号管理', + parentPath:null, + menuType:'manager', + show:true, + path: "/develop/account", + linkPath: ["/develop/account/add"] + }, + { + name: "account-add-manage", + menuName:'新建账号', + parentPath:'/develop/account', + menuType:'manager', + path: "/develop/account/add", + }, + { + name: "account-detail-manage", + menuName:'账号详情', + parentPath: '/develop/account', + menuType:'manager', + path: "/develop/account/detail", + }, + { + name: "menu-manage", + menuName:'菜单管理', parentPath:null, menuType:'manager', show:true, - icon: "#bg-ic-ability", - children:[ - { - name: "account-manage", - menuName:'系统账号管理', - parentPath:null, - menuType:'manager', - show:true, - path: "/develop/account", - linkPath: ["/develop/account/add"] - }, - { - name: "account-add-manage", - menuName:'新建账号', - parentPath:'/develop/account', - menuType:'manager', - path: "/develop/account/add", - }, - { - name: "account-detail-manage", - menuName:'账号详情', - parentPath: '/develop/account', - menuType:'manager', - path: "/develop/account/detail", - }, - { - name: "menu-manage", - menuName:'菜单管理', - parentPath:null, - menuType:'manager', - show:true, - path: "/develop/menu", - }, - - ] + path: "/develop/menu", }, + ] + }, + { + menuName: "系统管理", + path: "/system", + parentPath:null, + menuType:'manager', + show:true, + icon: "#bg-ic-ability", + children:[ { - menuName: "系统管理", - path: "/system", + name: "system-manage", + menuName:'组织管理', parentPath:null, menuType:'manager', show:true, - icon: "#bg-ic-ability", - children:[ - { - name: "system-manage", - menuName:'组织管理', - parentPath:null, - menuType:'manager', - show:true, - path: "/system/organization", - }, - { - name: "paltform-user-manage", - menuName:'新增平台用户', - parentPath: '/system/organization', - menuType:'manager', - show:false, - path: "/system/organization/platform-user", - }, - { - name: "system-user-manage", - menuName:'新增组织用户', - parentPath: '/system/organization', - menuType:'manager', - show: false, - path: "/system/organization/system-user", - }, - { - name: "user-detail-manage", - menuName:'用户详情', - parentPath: '/system/organization', - menuType:'manager', - show: false, - path: "/system/organization/user-detail", - }, - { - name: "org-detail-manage", - menuName:'组织详情', - parentPath: '/system/organization', - menuType:'manager', - show: false, - path: "/system/organization/org-detail", - }, - { - name: "role-manage", - menuName:'角色管理', - parentPath:null, - menuType:'manager', - show:true, - path: "/system/role", - }, - - ] + path: "/system/organization", + }, + { + name: "paltform-user-manage", + menuName:'新增平台用户', + parentPath: '/system/organization', + menuType:'manager', + show:false, + path: "/system/organization/platform-user", + }, + { + name: "system-user-manage", + menuName:'新增组织用户', + parentPath: '/system/organization', + menuType:'manager', + show: false, + path: "/system/organization/system-user", + }, + { + name: "user-detail-manage", + menuName:'用户详情', + parentPath: '/system/organization', + menuType:'manager', + show: false, + path: "/system/organization/user-detail", + }, + { + name: "org-detail-manage", + menuName:'组织详情', + parentPath: '/system/organization', + menuType:'manager', + show: false, + path: "/system/organization/org-detail", }, { - menuName: "配置管理", - path: "/config", + name: "role-manage", + menuName:'角色管理', parentPath:null, menuType:'manager', show:true, - icon: "#bg-ic-ability", - children:[ - { - name: "dict-manage", - menuName:'字典管理', - parentPath:null, - menuType:'manager', - show:true, - path: "/config/dict", - }, - - ] + path: "/system/role", }, - ] + + ] }, { - name:"index", - menuName:"首页", - path: "/", + menuName: "配置管理", + path: "/config", parentPath:null, - menuType:'font', - level:1, + menuType:'manager', show:true, - + icon: "#bg-ic-ability", + children:[ + { + name: "dict-manage", + menuName:'字典管理', + parentPath:null, + menuType:'manager', + show:true, + path: "/config/dict", + }, + + ] }, ] +}, +] function getViews(path) { @@ -303,20 +297,20 @@ function getViews(path) { let pathArr = path.split('/') let modules = {} switch (pathArr.length) { - case 2: - modules = import.meta.glob('../page/main/**/*.vue') - break; - case 3: - modules = import.meta.glob('../page/main/**/*/*.vue') - break; - case 4: - modules = import.meta.glob('../page/main/**/**/*/*.vue') - break; - case 5: - modules = import.meta.glob('../page/main/**/**/**/*/*.vue') - break; - default: - break; +case 2: + modules = import.meta.glob('../page/main/**/*.vue') + break; +case 3: + modules = import.meta.glob('../page/main/**/*/*.vue') + break; +case 4: + modules = import.meta.glob('../page/main/**/**/*/*.vue') + break; +case 5: + modules = import.meta.glob('../page/main/**/**/**/*/*.vue') + break; +default: + break; } // 然后动态路由的时候这样来取 console.log(modules['../page/main' + path + '/index.vue']); @@ -326,29 +320,24 @@ return modules['../page/main' + path + '/index.vue'] //处理路由方法 var menuToRouter = (menu)=>{ menu.forEach(e => { - //第一层级是最上层菜单，有相应的菜单可以点击查看 - if(e.children&&e.level==1){ - console.log(`@/page/main${e.path}/index.vue`); - e.component= getViews(e.path) - menuToRouter(e.children) - }else if(e.children){ - // 其他层级作为文件夹，只提供父级 - e.component = () => import('../page/parent/parent.vue') - menuToRouter(e.children) +if(e.children){ + // 其他层级作为文件夹，只提供父级 + e.component = () => import('../page/parent/parent.vue') + menuToRouter(e.children) +}else{ + console.log(`@/page/main${e.path}/index.vue`); + //叶子层级需要加载到对应文件 + //对首页做兼容 + if(e.path=='/'){ + e.component = () => import('../page/main/index/index.vue') }else{ - console.log(`@/page/main${e.path}/index.vue`); - //叶子层级需要加载到对应文件 - //对首页做兼容 - if(e.path=='/'){ - e.component = () => import('../page/main/develop/account/index.vue') - }else{ - e.component= getViews(e.path) - } + e.component= getViews(e.path) } +} }); } export default { - adminMenu, - menuToRouter +adminMenu, +menuToRouter } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index ea77b0df35b2145464fec0bd1da6cb0041b8ecab..d5ba66d2d5049e600f5071212051b9f90e8ee504 100644 --- a/yarn.lock +++ b/yarn.lock @@ -895,11 +895,6 @@ is-url@^1.2.4: resolved "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== -js-md5@^0.7.3: - version "0.7.3" - resolved "https://mirrors.cloud.tencent.com/npm/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" - integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ== - lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz"