From 0a1cc1a69b169874dadb144220b610b174473a13 Mon Sep 17 00:00:00 2001 From: sakuya <81883387@qq.com> Date: Wed, 9 Jun 2021 22:27:49 +0800 Subject: [PATCH] UP --- src/api/index.js | 9 ++++- src/views/home/index.vue | 26 +++++++++++--- src/views/home/stats/index.vue | 2 +- src/views/home/work/index.vue | 31 +++++++++++++++-- src/views/login.vue | 50 +++++++++++++++++++++++++-- src/views/setting/role/permission.vue | 12 +++++-- 6 files changed, 115 insertions(+), 15 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index c3e78913..1b487043 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -22,7 +22,14 @@ const api = { user: { login: { url: `${config.MOCK_URL}/login`, - name: "登录获取用户菜单和权限", + name: "登录获取用户菜单和权限,全部权限", + get: async function(){ + return await http.get(this.url); + } + }, + login_demo: { + url: `${config.MOCK_URL}/login_user`, + name: "登录获取用户菜单和权限,部分权限", get: async function(){ return await http.get(this.url); } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c0bb0401..42fafab4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,6 +1,16 @@ diff --git a/src/views/home/stats/index.vue b/src/views/home/stats/index.vue index 9baa5567..b21fd1a1 100644 --- a/src/views/home/stats/index.vue +++ b/src/views/home/stats/index.vue @@ -59,7 +59,7 @@ return {} }, mounted(){ - + this.$emit('on-mounted') }, methods: { diff --git a/src/views/home/work/index.vue b/src/views/home/work/index.vue index 8faa7157..137fe4c0 100644 --- a/src/views/home/work/index.vue +++ b/src/views/home/work/index.vue @@ -1,9 +1,36 @@ - diff --git a/src/views/login.vue b/src/views/login.vue index 1ac6787d..e321541c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -24,7 +24,35 @@ - 登 录 + + 登 录 + + @@ -62,6 +90,11 @@ .login-footer {text-align: center;color: #999;margin-top: 50px;} + .demo-user-item {display: flex;align-items: center;line-height: 1;padding:10px 0;} + .demo-user-item .icon {margin-right: 20px;} + .demo-user-item .info h2 {font-size: 14px;} + .demo-user-item .info p {color: #666;margin-top: 6px;} + @media (max-height: 650px){ .login_container {position: static;transform: none;margin:50px auto;} } @@ -93,10 +126,11 @@ this.$TOOL.data.remove("user") }, methods: { - submitForm(formName) { + submitForm(formName, type) { this.$refs[formName].validate((valid) => { if (valid) { - this.login() + type=='admin' && this.login() + type=='user' && this.login_demo() }else{ console.log('error submit!!'); return false; @@ -112,6 +146,16 @@ }); //开启欢迎词 this.$message.success("Login Success 登录成功") + }, + login_demo: async function() { + this.islogin = true; + var userInfo = await this.$API.user.login_demo.get(); + this.$TOOL.data.set("user", userInfo.data); + this.$router.replace({ + path: '/' + }); + //开启欢迎词 + this.$message.success("Login Success 登录成功") } } } diff --git a/src/views/setting/role/permission.vue b/src/views/setting/role/permission.vue index e79565b7..a5ed58e0 100644 --- a/src/views/setting/role/permission.vue +++ b/src/views/setting/role/permission.vue @@ -19,7 +19,10 @@ - + + {{ item.label }} + {{ item.views }} +
用于控制角色登录后控制台的视图
@@ -55,11 +58,14 @@ dashboardOptions: [ { value: '0', - label: '数据统计' + label: '数据统计', + views: 'stats' + }, { value: '1', - label: '工作台' + label: '工作台', + views: 'work' }, ] }