Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n
This commit is contained in:
commit
2dbe6aa5b9
|
|
@ -16,7 +16,6 @@ import chatRouter from './modules/chat'
|
|||
import othersRouter from './modules/other'
|
||||
import externalLink from './modules/externalLink'
|
||||
import formRouter from './modules/from'
|
||||
import iframeRouter from './modules/iframe'
|
||||
|
||||
// 异步组件
|
||||
export const asyncRoutes = [
|
||||
|
|
@ -31,7 +30,6 @@ export const asyncRoutes = [
|
|||
...errorRouter,
|
||||
...externalLink,
|
||||
...systemRouter,
|
||||
...iframeRouter,
|
||||
{
|
||||
path: '/:pathMatch(.*)',
|
||||
redirect: '/404'
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ const excelRouter = [{
|
|||
path: 'zip',
|
||||
component: () => import('@/views/excel/zip/index.vue'),
|
||||
name: 'Zip',
|
||||
meta: { title: 'Zip', roles:['other'] ,icon: 'MenuIcon',}
|
||||
meta: { title: '导出 Zip', roles:['other'] ,icon: 'MenuIcon',}
|
||||
},
|
||||
]
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -7,11 +7,26 @@ const externalLink = [{
|
|||
component: Layout,
|
||||
redirect: 'noRedirect',
|
||||
name: 'external-link',
|
||||
meta: {
|
||||
title: '外部链接',
|
||||
icon: 'link'
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'https://github.com/zouzhibin/vue-admin-perfect',
|
||||
name: 'external',
|
||||
meta: { title: 'Github地址', icon: 'link' }
|
||||
name: 'github',
|
||||
meta: { title: 'Github 地址', icon: 'MenuIcon' }
|
||||
},
|
||||
{
|
||||
path: 'https://gitee.com/yuanzbz/vue-admin-perfect?_from=gitee_search',
|
||||
name: 'github',
|
||||
meta: { title: 'Gitee 地址', icon: 'MenuIcon' }
|
||||
},
|
||||
{
|
||||
path: 'iframe',
|
||||
component: () => import('@/views/externalLinks/iframe/index.vue'),
|
||||
name: 'iframe',
|
||||
meta: { title: '内嵌 iframe', icon: 'MenuIcon' }
|
||||
},
|
||||
]
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
/** When your routing table is too long, you can split it into small modules**/
|
||||
|
||||
import Layout from "@/layout/index.vue";
|
||||
|
||||
const iframeRouter = [{
|
||||
path: '/iframe',
|
||||
component: Layout,
|
||||
redirect: '/iframe/embedded',
|
||||
name: 'iframe',
|
||||
meta: {
|
||||
title: '内嵌 iframe',
|
||||
icon: 'Memo'
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path: 'embedded',
|
||||
component: () => import('@/views/iframe/embedded/index.vue'),
|
||||
name: 'embedded',
|
||||
meta: { title: '内嵌 iframe', icon: 'Postcard' }
|
||||
},
|
||||
]
|
||||
}]
|
||||
|
||||
export default iframeRouter
|
||||
Loading…
Reference in New Issue