From a92516eb802c526f7b67c178d550cb62941b202c Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 30 Mar 2023 12:13:14 +0800 Subject: [PATCH] :zap: fix user api --- src/api/system/user.js | 26 +++++++++++++------------- src/api/user.js | 2 +- src/views/system/user.vue | 8 ++++---- src/views/work/process/leave/form.vue | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index fa65b8e..079c50c 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -4,7 +4,7 @@ import request from '@/axios'; export const getList = (current, size, params, deptId) => { return request({ - url: '/blade-system/page', + url: '/blade-system/user/page', method: 'get', params: { ...params, @@ -17,7 +17,7 @@ export const getList = (current, size, params, deptId) => { export const remove = (ids) => { return request({ - url: '/blade-system/remove', + url: '/blade-system/user/remove', method: 'post', params: { ids, @@ -27,7 +27,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/blade-system/submit', + url: '/blade-system/user/submit', method: 'post', data: row }) @@ -35,7 +35,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/blade-system/update', + url: '/blade-system/user/update', method: 'post', data: row }) @@ -43,7 +43,7 @@ export const update = (row) => { export const updatePlatform = (userId, userType, userExt) => { return request({ - url: '/blade-system/update-platform', + url: '/blade-system/user/update-platform', method: 'post', params: { userId, @@ -55,7 +55,7 @@ export const updatePlatform = (userId, userType, userExt) => { export const getUser = (id) => { return request({ - url: '/blade-system/detail', + url: '/blade-system/user/detail', method: 'get', params: { id, @@ -65,7 +65,7 @@ export const getUser = (id) => { export const getUserPlatform = (id) => { return request({ - url: '/blade-system/platform-detail', + url: '/blade-system/user/platform-detail', method: 'get', params: { id, @@ -75,14 +75,14 @@ export const getUserPlatform = (id) => { export const getUserInfo = () => { return request({ - url: '/blade-system/info', + url: '/blade-system/user/info', method: 'get', }) } export const resetPassword = (userIds) => { return request({ - url: '/blade-system/reset-password', + url: '/blade-system/user/reset-password', method: 'post', params: { userIds, @@ -92,7 +92,7 @@ export const resetPassword = (userIds) => { export const updatePassword = (oldPassword, newPassword, newPassword1) => { return request({ - url: '/blade-system/update-password', + url: '/blade-system/user/update-password', method: 'post', params: { oldPassword, @@ -104,7 +104,7 @@ export const updatePassword = (oldPassword, newPassword, newPassword1) => { export const updateInfo = (row) => { return request({ - url: '/blade-system/update-info', + url: '/blade-system/user/update-info', method: 'post', data: row }) @@ -112,7 +112,7 @@ export const updateInfo = (row) => { export const grant = (userIds, roleIds) => { return request({ - url: '/blade-system/grant', + url: '/blade-system/user/grant', method: 'post', params: { userIds, @@ -123,7 +123,7 @@ export const grant = (userIds, roleIds) => { export const unlock = (userIds) => { return request({ - url: '/blade-system/unlock', + url: '/blade-system/user/unlock', method: 'post', params: { userIds, diff --git a/src/api/user.js b/src/api/user.js index 295c1df..38f0f7d 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -71,7 +71,7 @@ export const refreshToken = (refresh_token, tenantId, deptId, roleId) => request }); export const registerGuest = (form, oauthId) => request({ - url: '/blade-system/register-guest', + url: '/blade-system/user/register-guest', method: 'post', params: { tenantId: form.tenantId, diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 47062ad..693c7da 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -622,7 +622,7 @@ export default { res: 'data' }, tip: '请上传 .xls,.xlsx 标准格式文件', - action: "/blade-system/import-user" + action: "/blade-system/user/import-user" }, { label: "数据覆盖", @@ -669,7 +669,7 @@ export default { 'excelForm.isCovered' () { if (this.excelForm.isCovered !== '') { const column = this.findObject(this.excelOption.column, "excelFile"); - column.action = `/blade-system/import-user?isCovered=${this.excelForm.isCovered}`; + column.action = `/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`; } } }, @@ -903,14 +903,14 @@ export default { type: "warning" }).then(() => { NProgress.start(); - exportBlob(`/blade-system/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => { + exportBlob(`/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => { downloadXls(res.data, `用户数据表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`); NProgress.done(); }) }); }, handleTemplate () { - exportBlob(`/blade-system/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => { + exportBlob(`/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => { downloadXls(res.data, "用户数据模板.xlsx"); }) }, diff --git a/src/views/work/process/leave/form.vue b/src/views/work/process/leave/form.vue index 6fd7cd4..07c0bc9 100644 --- a/src/views/work/process/leave/form.vue +++ b/src/views/work/process/leave/form.vue @@ -31,7 +31,7 @@ export default { label: '审批人员', prop: 'taskUser', type: 'select', - dicUrl: `/blade-system/user-list`, + dicUrl: `/blade-system/user/user-list`, props: { label: "account", value: "id"