From 3a65e5533ebb1ee52afd02ba438d4396b11bce01 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 14 Jul 2019 23:54:06 +0800 Subject: [PATCH] :tada: 2.0.5.RELEASE --- package.json | 2 +- src/api/system/topmenu.js | 77 +++++++++ src/store/modules/user.js | 4 +- src/views/system/topmenu.vue | 294 +++++++++++++++++++++++++++++++++++ 4 files changed, 375 insertions(+), 2 deletions(-) create mode 100644 src/api/system/topmenu.js create mode 100644 src/views/system/topmenu.vue diff --git a/package.json b/package.json index 22f87ae..bb5a2e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "saber-admin", - "version": "2.0.4", + "version": "2.0.5", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/api/system/topmenu.js b/src/api/system/topmenu.js new file mode 100644 index 0000000..4b280a3 --- /dev/null +++ b/src/api/system/topmenu.js @@ -0,0 +1,77 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/blade-system/topmenu/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/blade-system/topmenu/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/blade-system/topmenu/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/blade-system/topmenu/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/blade-system/topmenu/submit', + method: 'post', + data: row + }) +} + +export const grantTree = () => { + return request({ + url: '/api/blade-system/menu/grant-top-tree', + method: 'get', + }) +} + +export const getTopTree = (topMenuIds) => { + return request({ + url: '/api/blade-system/menu/top-tree-keys', + method: 'get', + params: { + topMenuIds, + } + }) +} + +export const grant = (topMenuIds, menuIds) => { + return request({ + url: '/api/blade-system/topmenu/grant', + method: 'post', + params: { + topMenuIds, + menuIds, + } + }) +} diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e38857b..ee36c2b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -43,7 +43,7 @@ const user = { actions: { //根据用户名登录 LoginByUsername({ commit }, userInfo) { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { loginByUsername(userInfo.tenantId, userInfo.username, userInfo.password, userInfo.type).then(res => { const data = res.data; if (data.error_description) { @@ -59,6 +59,8 @@ const user = { commit('CLEAR_LOCK'); } resolve(); + }).catch(error => { + reject(error); }) }) }, diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue new file mode 100644 index 0000000..87d6171 --- /dev/null +++ b/src/views/system/topmenu.vue @@ -0,0 +1,294 @@ + + + + +