Merge branch 'main' of http://129.211.33.98:3210/hjq/aircraft-admin
This commit is contained in:
commit
fd339a4c8c
@ -36,9 +36,9 @@ export default {
|
|||||||
let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
|
let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
|
||||||
const first = matched[0]
|
const first = matched[0]
|
||||||
|
|
||||||
if (!this.isDashboard(first)) {
|
// if (!this.isDashboard(first)) {
|
||||||
matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched)
|
// matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched)
|
||||||
}
|
// }
|
||||||
|
|
||||||
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
|
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
|
||||||
},
|
},
|
||||||
|
@ -35,14 +35,14 @@ export const constantRouterMap = [
|
|||||||
{
|
{
|
||||||
path: '/',
|
path: '/',
|
||||||
component: Layout,
|
component: Layout,
|
||||||
redirect: '/dashboard',
|
// redirect: '/dashboard',
|
||||||
children: [
|
children: [
|
||||||
{
|
// {
|
||||||
path: 'dashboard',
|
// path: 'dashboard',
|
||||||
component: (resolve) => require(['@/views/home'], resolve),
|
// component: (resolve) => require(['@/views/home'], resolve),
|
||||||
name: 'Dashboard',
|
// name: 'Dashboard',
|
||||||
meta: { title: '首页', icon: 'index', affix: true, noCache: true }
|
// meta: { title: '首页', icon: 'index', affix: true, noCache: true }
|
||||||
}
|
// }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -56,8 +56,10 @@ export default {
|
|||||||
codeUrl: '',
|
codeUrl: '',
|
||||||
cookiePass: '',
|
cookiePass: '',
|
||||||
loginForm: {
|
loginForm: {
|
||||||
username: 'admin',
|
// username: 'admin',
|
||||||
password: '123456',
|
// password: '123456',
|
||||||
|
username: '',
|
||||||
|
password: '',
|
||||||
rememberMe: false,
|
rememberMe: false,
|
||||||
code: '',
|
code: '',
|
||||||
uuid: ''
|
uuid: ''
|
||||||
|
Loading…
Reference in New Issue
Block a user