diff --git a/index.html b/index.html index dfafab8..4d5b147 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,16 @@ - - - vue element admin - - -
- -
- - - + + + + vue element admin + + + +
+ +
+ + + + \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index b90d312..de2170f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,21 +11,7 @@ export default { name: 'app', components: { - }, - // beforeCreate: function () { - // let user = JSON.parse(localStorage.getItem('user')); - // if (!user) { - // this.$router.replace('/login') - // } - // } - watch: { - '$route'(to, from) {//监听路由改变 - let user = JSON.parse(sessionStorage.getItem('user')); - if (!user) { - this.$router.replace('/login') - } - } - }, + } } diff --git a/src/main.js b/src/main.js index ba5fbd7..f65cd12 100644 --- a/src/main.js +++ b/src/main.js @@ -8,19 +8,7 @@ import store from './vuex/store' import Vuex from 'vuex' import NProgress from 'nprogress'//页面顶部进度条 import 'nprogress/nprogress.css' - -import Login from './pages/Login.vue' -import Home from './pages/Home.vue' -import Main from './pages/Main.vue' -import Table from './pages/nav1/Table.vue' -import Form from './pages/nav1/Form.vue' -import user from './pages/nav1/user.vue' -import Page4 from './pages/nav2/Page4.vue' -import Page5 from './pages/nav2/Page5.vue' -import Page6 from './pages/nav3/Page6.vue' -import echarts from './pages/charts/echarts.vue' - -// start mock +import routes from './routes' import Mock from './mock'; Mock.bootstrap(); @@ -30,72 +18,26 @@ Vue.use(Vuex) NProgress.configure({ showSpinner: false }); -const routes = [ - { - path: '/login', - component: Login, - hidden: true//不显示在导航中 - }, - //{ path: '/main', component: Main }, - { - path: '/', - component: Home, - name: '导航一', - iconCls: 'el-icon-message',//图标样式class - children: [ - //{ path: '/main', component: Main }, - { path: '/table', component: Table, name: 'Table' }, - { path: '/form', component: Form, name: 'Form' }, - { path: '/user', component: user, name: '列表' }, - ] - }, - { - path: '/', - component: Home, - name: '导航二', - iconCls: 'fa fa-id-card-o', - children: [ - { path: '/page4', component: Page4, name: '页面4' }, - { path: '/page5', component: Page5, name: '页面5' } - ] - }, - { - path: '/', - component: Home, - name: '', - iconCls: 'fa fa-address-card', - leaf: true,//只有一个节点 - children: [ - { path: '/page6', component: Page6, name: '导航三' } - ] - }, - { - path: '/', - component: Home, - name: 'Charts', - iconCls: 'fa fa-bar-chart', - children: [ - { path: '/echarts', component: echarts, name: 'echarts' } - ] - } -] - const router = new VueRouter({ routes }) router.beforeEach((to, from, next) => { - NProgress.start(); + //NProgress.start(); + if (to.path == '/login') { + sessionStorage.removeItem('user'); + } let user = JSON.parse(sessionStorage.getItem('user')); if (!user && to.path != '/login') { next({ path: '/login' }) + } else { + next() } - next() }) -router.afterEach(transition => { - NProgress.done(); -}); +//router.afterEach(transition => { +//NProgress.done(); +//}); new Vue({ el: '#app', diff --git a/src/pages/404.vue b/src/pages/404.vue new file mode 100644 index 0000000..4269860 --- /dev/null +++ b/src/pages/404.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/pages/Home.vue b/src/pages/Home.vue index d161826..8077a31 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -2,86 +2,63 @@ - ADMIN + ADMIN - - - - {{sysUserName}} + + + + {{sysUserName}} - - 我的消息 - 设置 - 退出登录 - - - - - - - - - - -
-
- -{{currentPathName}} - -首页 -{{currentPathNameParent}} -{{currentPathName}} - - - - - - - -
-
- - - + + 我的消息 + 设置 + 退出登录 + + + + + + + + + +
+
+ + {{$route.name}} + + + {{ item.name }} + + + + + + + + +
+
+ + +