diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts index a9e78af2..e8aad533 100644 --- a/src/api/bpm/task/index.ts +++ b/src/api/bpm/task/index.ts @@ -48,7 +48,7 @@ export const getReturnList = async (params) => { } // 回退 -export const okRollback = async (data) => { +export const returnTask = async (data) => { return await request.put({ url: '/bpm/task/rollback', data }) } diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts index 61144662..60b6fc73 100644 --- a/src/api/system/dept/index.ts +++ b/src/api/system/dept/index.ts @@ -22,6 +22,10 @@ export const listSimpleDeptApi = async () => { return await request.get({ url: '/system/dept/simple-list' }) } +export const getSimpleDeptList = async () => { + return await request.get({ url: '/system/dept/simple-list' }) +} + // 查询部门列表 export const getDeptPageApi = async (params: DeptPageReqVO) => { return await request.get({ url: '/system/dept/list', params }) diff --git a/src/api/system/menu/index.ts b/src/api/system/menu/index.ts index 5913972b..1745cf36 100644 --- a/src/api/system/menu/index.ts +++ b/src/api/system/menu/index.ts @@ -28,6 +28,10 @@ export const listSimpleMenusApi = () => { return request.get({ url: '/system/menu/list-all-simple' }) } +export const getSimpleMenusList = () => { + return request.get({ url: '/system/menu/list-all-simple' }) +} + // 查询菜单列表 export const getMenuListApi = (params: MenuPageReqVO) => { return request.get({ url: '/system/menu/list', params }) diff --git a/src/api/system/notice/index.ts b/src/api/system/notice/index.ts index 56f624dc..dbf64a37 100644 --- a/src/api/system/notice/index.ts +++ b/src/api/system/notice/index.ts @@ -42,6 +42,6 @@ export const deleteNoticeApi = (id: number) => { } // 推送公告 -export const pushNotice = (id: number) => { +export const pushNoticeApi = (id: number) => { return request.post({ url: '/system/notice/push?id=' + id }) } diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index aa3ed134..8671a847 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -92,5 +92,9 @@ export const updateUserStatusApi = (id: number, status: number) => { // 获取用户精简信息列表 export const getListSimpleUsersApi = () => { - return request.get({ url: '/system/user/list-all-simple' }) + return request.get({ url: '/system/user/simple-list' }) +} + +export const getSimpleUserList = () => { + return request.get({ url: '/system/user/simple-list' }) } diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index 1eb9293c..31c7d977 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -218,7 +218,7 @@ const getCode = async () => { //获取租户ID const getTenantId = async () => { if (loginData.tenantEnable) { - const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName) + const res = await LoginApi.getTenantIdByNameApi(loginData.loginForm.tenantName) authUtil.setTenantId(res) } } @@ -274,7 +274,7 @@ const handleLogin = async (params) => { const code = route?.query?.code as string const state = route?.query?.state as string - const res = await LoginApi.login({ + const res = await LoginApi.loginApi({ // 账号密码登录 username: loginData.loginForm.username, password: loginData.loginForm.password,