From df14656d8e637daf94dd0b0111ef6518c0d8ca09 Mon Sep 17 00:00:00 2001 From: lin-xin <2981207131@qq.com> Date: Mon, 23 Apr 2018 19:43:32 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=96=B0=E5=A2=9Edashboard,=E7=A7=BB=E9=99=A4?= =?UTF-8?q?readme.vue'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +- README_EN.md | 5 +- src/components/common/Sidebar.vue | 4 +- src/components/common/Tags.vue | 5 +- src/components/page/403.vue | 2 +- src/components/page/404.vue | 2 +- src/components/page/Dashboard.vue | 247 ++++++++++++++++++++++++++++++ src/components/page/Login.vue | 2 +- src/components/page/Readme.vue | 88 ----------- src/main.js | 6 +- src/router/index.js | 10 +- static/css/main.css | 7 - 12 files changed, 271 insertions(+), 112 deletions(-) create mode 100644 src/components/page/Dashboard.vue delete mode 100644 src/components/page/Readme.vue diff --git a/README.md b/README.md index 0bfd831..c0eda0e 100644 --- a/README.md +++ b/README.md @@ -37,15 +37,18 @@ | |-- Header.vue // 公共头部 | |-- Home.vue // 公共路由入口 | |-- Sidebar.vue // 公共左边栏 + | |-- Tags.vue // 页面切换标签组件 | |-- page // 主要路由页面 + | |-- 403.vue + | |-- 404.vue | |-- BaseCharts.vue // 基础图表 | |-- BaseForm.vue // 基础表单 | |-- BaseTable.vue // 基础表格 + | |-- DashBoard.vue // 系统首页 | |-- DragList.vue // 拖拽列表组件 | |-- Login.vue // 登录 | |-- Markdown.vue // markdown组件 | |-- Premission.vue // 权限测试组件 - | |-- Readme.vue // 自述组件 | |-- Upload.vue // 图片上传 | |-- VueEditor.vue // 富文本编辑器 | |-- App.vue // 页面入口文件 diff --git a/README_EN.md b/README_EN.md index 419ba7a..4bffb1e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -31,15 +31,18 @@ The scheme as a set of multi-function background frame templates, suitable for m | |-- Header.vue // Header component | |-- Home.vue // Home component | |-- Sidebar.vue // Sidebar component + | |-- Tags.vue | |-- page // Router page + | |-- 403.vue + | |-- 404.vue | |-- BaseCharts.vue // BaseCharts | |-- BaseForm.vue // BaseForm | |-- BaseTable.vue // BaseTable | |-- Login.vue // Login + | |-- Dashboard.vue | |-- DragList.vue | |-- Markdown.vue // Markdown | |-- Premission.vue - | |-- Readme.vue // Readme | |-- Upload.vue // Upload | |-- VueEditor.vue // VueEditor | |-- App.vue // Main component diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 17327fc..9dec980 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -32,8 +32,8 @@ items: [ { icon: 'el-icon-setting', - index: 'readme', - title: '自述文件' + index: 'dashboard', + title: '系统首页' }, { icon: 'el-icon-tickets', diff --git a/src/components/common/Tags.vue b/src/components/common/Tags.vue index 5b5b5a1..fe7e3ee 100644 --- a/src/components/common/Tags.vue +++ b/src/components/common/Tags.vue @@ -40,14 +40,13 @@ if (item) { delItem.path === this.$route.path && this.$router.push(item.path); }else{ - this.$router.push('/readme'); + this.$router.push('/'); } }, // 关闭全部标签 closeAll(){ - console.log(1111); this.tagsList = []; - this.$router.push('/readme'); + this.$router.push('/'); }, // 关闭其他标签 closeOther(){ diff --git a/src/components/page/403.vue b/src/components/page/403.vue index 73cc3bb..01fc5be 100644 --- a/src/components/page/403.vue +++ b/src/components/page/403.vue @@ -3,7 +3,7 @@
403
啊哦~ 你没有权限访问该页面哦
- + 返回首页 返回上一页 diff --git a/src/components/page/404.vue b/src/components/page/404.vue index 55d102b..149ad7d 100644 --- a/src/components/page/404.vue +++ b/src/components/page/404.vue @@ -3,7 +3,7 @@
404
啊哦~ 你所访问的页面不存在
- + 返回首页 返回上一页 diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue new file mode 100644 index 0000000..5d0c54f --- /dev/null +++ b/src/components/page/Dashboard.vue @@ -0,0 +1,247 @@ + + + + + + diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue index cf46232..9a25553 100644 --- a/src/components/page/Login.vue +++ b/src/components/page/Login.vue @@ -41,7 +41,7 @@ this.$refs[formName].validate((valid) => { if (valid) { localStorage.setItem('ms_username',this.ruleForm.username); - this.$router.push('/readme'); + this.$router.push('/'); } else { console.log('error submit!!'); return false; diff --git a/src/components/page/Readme.vue b/src/components/page/Readme.vue deleted file mode 100644 index 1b9d632..0000000 --- a/src/components/page/Readme.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 720f368..48bac77 100644 --- a/src/main.js +++ b/src/main.js @@ -12,8 +12,10 @@ Vue.prototype.$axios = axios; //使用钩子函数对路由进行权限跳转 router.beforeEach((to, from, next) => { - if(to.meta.permission){ - const role = localStorage.getItem('ms_username'); + const role = localStorage.getItem('ms_username'); + if(!role){ + next('/login'); + }else if(to.meta.permission){ // 如果是管理员权限则可进入，这里只是简单的模拟管理员权限而已 role === 'admin' ? next() : next('/403'); }else{ diff --git a/src/router/index.js b/src/router/index.js index 629909a..b7a3f71 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,17 +7,17 @@ export default new Router({ routes: [ { path: '/', - redirect: '/login' + redirect: '/dashboard' }, { - path: '/readme', + path: '/', component: resolve => require(['../components/common/Home.vue'], resolve), meta: { title: '自述文件' }, children:[ { - path: '/', - component: resolve => require(['../components/page/Readme.vue'], resolve), - meta: { title: '自述文件' } + path: '/dashboard', + component: resolve => require(['../components/page/Dashboard.vue'], resolve), + meta: { title: '系统首页' } }, { path: '/table', diff --git a/static/css/main.css b/static/css/main.css index b1526f6..68cc36b 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -103,13 +103,6 @@ a { padding-bottom: 0; } -/*Readme*/ - -.ms-doc .el-checkbox__input.is-disabled+.el-checkbox__label { - color: #333; - cursor: pointer; -} - /*Upload*/ .pure-button {