From 9455db43f4b320593944219fa915f07e7b4ae768 Mon Sep 17 00:00:00 2001 From: chenghx Date: Fri, 3 Aug 2018 14:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 5 +- src/components/layout/GloablLayout.vue | 2 +- src/components/layout/HeaderlAvatar.vue | 6 +- src/components/layout/MenuView.vue | 17 ++ src/components/login/Login.vue | 155 +++++++++++++ src/components/menu/menu.js | 2 +- src/router/index.js | 289 +++++++++++++----------- 7 files changed, 332 insertions(+), 144 deletions(-) create mode 100644 src/components/layout/MenuView.vue create mode 100644 src/components/login/Login.vue diff --git a/src/App.vue b/src/App.vue index 305cb7f..257d6e3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,9 +1,6 @@ diff --git a/src/components/layout/GloablLayout.vue b/src/components/layout/GloablLayout.vue index fa2af77..050b782 100644 --- a/src/components/layout/GloablLayout.vue +++ b/src/components/layout/GloablLayout.vue @@ -61,7 +61,7 @@ export default { } }, beforeCreate () { - menuData = this.$router.options.routes + menuData = this.$router.options.routes.find((item) => item.path === '/').children } } diff --git a/src/components/layout/HeaderlAvatar.vue b/src/components/layout/HeaderlAvatar.vue index 445a234..a9f8ee1 100644 --- a/src/components/layout/HeaderlAvatar.vue +++ b/src/components/layout/HeaderlAvatar.vue @@ -15,8 +15,10 @@ - - 退出登录 + + + 退出登录 + diff --git a/src/components/layout/MenuView.vue b/src/components/layout/MenuView.vue new file mode 100644 index 0000000..c0af344 --- /dev/null +++ b/src/components/layout/MenuView.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/components/login/Login.vue b/src/components/login/Login.vue new file mode 100644 index 0000000..71520c1 --- /dev/null +++ b/src/components/login/Login.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js index 19b516e..c03f89d 100644 --- a/src/components/menu/menu.js +++ b/src/components/menu/menu.js @@ -51,7 +51,7 @@ export default { }, data () { return { - rootSubmenuKeys: ['/form', '/list', '/detail', '/exception', '/result'], + rootSubmenuKeys: ['/dashboard', '/form', '/list', '/detail', '/exception', '/result'], openKeys: [], selectedKeys: [], cachedOpenKeys: [] diff --git a/src/router/index.js b/src/router/index.js index 867a40e..09e2e41 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,6 +7,7 @@ import NotPermit from '@/components/exception/403' import ServerError from '@/components/exception/500' import PageView from '@/components/layout/PageView' import RouteView from '@/components/layout/RouteView' +import MenuView from '@/components/layout/MenuView' import BasicForm from '@/components/form/BasicForm' import StepForm from '@/components/form/stepForm/StepForm' import AdvancedForm from '@/components/form/advancedForm/AdvancedForm' @@ -20,173 +21,189 @@ import ArticleList from '@/components/list/ArticleList' import ApplicationList from '@/components/list/ApplicationList' import ProjectList from '@/components/list/ProjectList' import WorkPlace from '@/components/dashboard/WorkPlace' +import Login from '@/components/login/Login' Vue.use(Router) export default new Router({ routes: [ { - path: '/', - name: 'dashboard', - component: RouteView, - icon: 'dashboard', - children: [ - { - path: '/workplace', - name: '工作台', - component: WorkPlace, - alias: '/', - icon: 'none' - }, - { - path: '/dashboard', - name: '分析页', - component: Dashboard, - icon: 'none' - } - ] + path: '/login', + name: '登录页', + component: Login, + invisible: true }, { - path: '/form', - name: '表单页', - component: PageView, - icon: 'form', - children: [ - { - path: '/form/basic', - name: '基础表单', - component: BasicForm, - icon: 'none' - }, - { - path: '/form/step', - name: '分步表单', - component: StepForm, - icon: 'none' - }, - { - path: '/form/advanced', - name: '高级表单', - component: AdvancedForm, - icon: 'none' - } - ] - }, - { - path: '/list', - name: '列表页', - component: PageView, - icon: 'table', + path: '/', + name: 'home', + component: MenuView, + icon: 'none', + invisible: true, children: [ { - path: '/list/query', - name: '查询表格', - component: QueryList, - icon: 'none' - }, - { - path: '/list/primary', - name: '标准列表', - component: StandardList, - icon: 'none' - }, - { - path: '/list/card', - name: '卡片列表', - component: CardList, - icon: 'none' + path: '/dashboard', + name: 'dashboard', + component: RouteView, + icon: 'dashboard', + children: [ + { + path: '/dashboard/workplace', + name: '工作台', + component: WorkPlace, + alias: '/', + icon: 'none' + }, + { + path: '/dashboard/analysis', + name: '分析页', + component: Dashboard, + icon: 'none' + } + ] }, { - path: '/list/search', - name: '搜索列表', - component: SearchLayout, - icon: 'none', + path: '/form', + name: '表单页', + component: PageView, + icon: 'form', children: [ { - path: '/list/search/article', - name: '文章', - component: ArticleList, + path: '/form/basic', + name: '基础表单', + component: BasicForm, icon: 'none' }, { - path: '/list/search/application', - name: '应用', - component: ApplicationList, + path: '/form/step', + name: '分步表单', + component: StepForm, icon: 'none' }, { - path: '/list/search/project', - name: '项目', - component: ProjectList, + path: '/form/advanced', + name: '高级表单', + component: AdvancedForm, icon: 'none' } ] - } - ] - }, - { - path: '/detail', - name: '详情页', - icon: 'profile', - component: PageView, - children: [ - { - path: '/detail/basic', - name: '基础详情页', - icon: 'none', - component: NotFound }, { - path: '/detail/advanced', - name: '高级详情页', - icon: 'none', - component: NotFound - } - ] - }, - { - path: '/result', - name: '结果页', - icon: 'check-circle-o', - component: PageView, - children: [ - { - path: '/result/success', - name: '成功', - icon: 'none', - component: Success + path: '/list', + name: '列表页', + component: PageView, + icon: 'table', + children: [ + { + path: '/list/query', + name: '查询表格', + component: QueryList, + icon: 'none' + }, + { + path: '/list/primary', + name: '标准列表', + component: StandardList, + icon: 'none' + }, + { + path: '/list/card', + name: '卡片列表', + component: CardList, + icon: 'none' + }, + { + path: '/list/search', + name: '搜索列表', + component: SearchLayout, + icon: 'none', + children: [ + { + path: '/list/search/article', + name: '文章', + component: ArticleList, + icon: 'none' + }, + { + path: '/list/search/application', + name: '应用', + component: ApplicationList, + icon: 'none' + }, + { + path: '/list/search/project', + name: '项目', + component: ProjectList, + icon: 'none' + } + ] + } + ] }, { - path: '/result/error', - name: '失败', - icon: 'none', - component: Error - } - ] - }, - { - path: '/exception', - name: '异常页', - icon: 'warning', - component: Exception, - children: [ - { - path: '/exception/404', - name: '404', - icon: 'none', - component: NotFound + path: '/detail', + name: '详情页', + icon: 'profile', + component: PageView, + children: [ + { + path: '/detail/basic', + name: '基础详情页', + icon: 'none', + component: NotFound + }, + { + path: '/detail/advanced', + name: '高级详情页', + icon: 'none', + component: NotFound + } + ] }, { - path: '/exception/403', - name: '403', - icon: 'none', - component: NotPermit + path: '/result', + name: '结果页', + icon: 'check-circle-o', + component: PageView, + children: [ + { + path: '/result/success', + name: '成功', + icon: 'none', + component: Success + }, + { + path: '/result/error', + name: '失败', + icon: 'none', + component: Error + } + ] }, { - path: '/exception/500', - name: '500', - icon: 'none', - component: ServerError + path: '/exception', + name: '异常页', + icon: 'warning', + component: Exception, + children: [ + { + path: '/exception/404', + name: '404', + icon: 'none', + component: NotFound + }, + { + path: '/exception/403', + name: '403', + icon: 'none', + component: NotPermit + }, + { + path: '/exception/500', + name: '500', + icon: 'none', + component: ServerError + } + ] } ] }