diff --git a/package.json b/package.json
index 6d0fe1e..927d3f4 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
},
"dependencies": {
"axios": "^1.1.2",
+ "core-js": "3.6.5",
"element-ui": "2.13.2",
"js-cookie": "2.2.0",
"normalize.css": "7.0.0",
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 503a7ab..dc03771 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,5 +1,5 @@
-
+
{{ item.meta.title }}
@@ -30,11 +30,13 @@ export default {
methods: {
getBreadcrumb() {
// only show routes with meta.title
+
let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+ console.log(this.$route);
const first = matched[0]
if (!this.isDashboard(first)) {
- // matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+ //matched = [{ path: '/homepage', meta: { title: 'Dashboard' }}].concat(matched)
matched = [{ path: '/dashboard', meta: { title: '' }}].concat(matched)
}
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 530b3d5..58f6602 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -20,6 +20,7 @@ export default {
},
type() {
if (this.isExternal) {
+ //console.log(this.isExternal);
return 'a'
}
return 'router-link'
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 2d37355..14a0392 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -25,7 +25,7 @@ export default {
data() {
return {
title: '嘉洛马',
- logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+ logo: 'https://static.jialuoma.cn/img/logo_jialuoma.png'
}
}
}
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index ccf7e6e..4b4e519 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -5,13 +5,26 @@
-
-
+
+
+
+
+
+
+
+
@@ -102,14 +115,19 @@ export default {
return false
},
resolvePath(routePath) {
+
if (isExternal(routePath)) {
return routePath
}
+ //console.log(this.basePath);
+ //console.log(routePath);
if (isExternal(this.basePath)) {
+ //console.log(this.basePath);
return this.basePath
}
+
return path.resolve(this.basePath, routePath)
}
}
}
-
+
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 2a31347..b7c3499 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -3,7 +3,6 @@
import('@/views/filemange/index'),
meta: { title: '', icon: 'dashboard' }
},
@@ -73,28 +75,22 @@ export const constantRoutes = [
]
},
{
- path: '/',
+ path: '/usermange',
component: Layout,
- children: [{
- path: 'usermange',
- name: 'Usermange',
- component: () => import('@/views/usermanage/index'),
- meta: { title: '用户管理', icon: 'dashboard' }
- }]
+ name: 'usermange',
+ children: [
+ {
+ path: 'index',
+ name: 'Usermange',
+ component: () => import('@/views/usermanage/index'),
+ meta: { title: '用户管理', icon: 'form' }
+ }
+ ]
},
- // {
- // path: '/',
- // component: Layout,
- // children: [{
- // path: 'subfile',
- // name: 'Subfile',
- // component: () => import('@/views/subfile/index'),
- // meta: { title: '文件管理', icon: 'dashboard' }
- // }]
- // },
{
path: '/systme',
component: Layout,
+ redirect: '/systme/changepass',
name: 'systme',
meta: { title: '系统管理', icon: 'el-icon-s-help' },
children: [
@@ -118,77 +114,24 @@ export const constantRoutes = [
}
]
},
- {
- path: 'external-link',
- component: Layout,
- children: [
- {
- path: 'https://dev.filesite.io/',
- meta: { title: '前端展示页面', icon: 'link' }
- }
- ]
- },
-
+
+ { path: '*', redirect: '/404', hidden: true }
// 404 page must be placed at the end !!!
- { path: '*', redirect: '/404', hidden: true }
+
]
-const createRouter = (a) => new Router({
- //mode: 'history', // require service support
- scrollBehavior: () => ({ y: 0 }),
- routes: a
+const createRouter = () => new Router({
+ //mode: 'history', // require service supportmode: 'history',
+ scrollBehavior: () => ({ y: 0 }),
+ routes: constantRoutes
})
-//let router
-const router = createRouter(constantRoutes)
-// 动态添加路由
-// import { mirlist } from '@/api/user'
-// let pachs = () => import('@/views/filemange/index');
-// mirlist().then(response => {
-// let datamain = response.data;
-// //routesData(datamain.data.menus);
-// //console.log(response);
-// datamain.data.menus.forEach(item => {
-// menus.push(
-// {
-// path: item.directory,
-// name: item.directory,
-// component: pachs,
-// meta: { title: item.directory, icon: 'dashboard' }
-// }
-// );
-// });
-// //console.log(menus);
-// //router = createRouter(constantRoutes)
-// console.log(router.options);
-// router = createRouter(constantRoutes)
-// // {
-// // path: 'filemange',
-// // name: 'Filemange',
-// // component: () => import('@/views/filemange/index'),
-// // meta: { title: '文件管理', icon: 'dashboard' }
-// // }
-
-// }).catch(function (error) {
-// Message({
-// showClose: true,
-// message: error,
-// type: 'error'
-// });
-// });
-//router = createRouter(constantRoutes)
-//router.addRoutes(constantRoutes);
-
+const router = createRouter()
// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
export function resetRouter() {
const newRouter = createRouter()
- router.matcher = newRouter.matcher // reset router 重置路由器
+ router.matcher = newRouter.matcher // reset router
}
-// router.reloadRouter = function () {
-// router.matcher = new Router({
-// mode: "history",
-// constantRoutes
-// }).matcher
-// }
+
export default router
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0062411..a41481e 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -47,3 +47,5 @@
.el-range-separator {
box-sizing: content-box;
}
+
+.el-submenu__title i{color:#FFF;}
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index ca8b22f..d36a53d 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -20,6 +20,10 @@
z-index: 2002;
overflow: hidden;
+ .el_submenu_link{width:76%;height:56px;z-index:100;position:absolute;left:0;top:0;bottom:0;right:10%;}
+ .el_submenu_link:hover{background-color:rgba(0, 0, 0, 0.3);}
+
+
// reset element-ui css
.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
@@ -67,14 +71,15 @@
height: 100%;
width: 100% !important;
}
+ .el-menu>div{position:relative;}
// menu hover
- .submenu-title-noDropdown,
- .el-submenu__title {
- &:hover {
- background-color: $menuHover !important;
- }
- }
+ // .submenu-title-noDropdown,
+ // .el-submenu__title {
+ // &:hover {
+ // background-color: $menuHover !important;
+ // }
+ // }
.is-active>.el-submenu__title {
color: $subMenuActiveText !important;
diff --git a/src/views/subfile/index.vue b/src/views/subfile/index.vue
index 1f88de0..433be28 100644
--- a/src/views/subfile/index.vue
+++ b/src/views/subfile/index.vue
@@ -14,7 +14,7 @@
搜索
-
+