From ecf894cce2c6cd677120bc563040f07fdcb18dc0 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 25 Sep 2023 18:22:22 +0800 Subject: [PATCH] chore: compose workflow api --- src/api/flowable-designer/index.js | 10 +++---- src/api/panel/index.js | 25 +++++++++-------- .../Popups/StaffAssignmentsTemplate/index.vue | 2 +- .../Panel/Popups/UserSelectTemplate/index.vue | 10 +++---- src/utils/request.js | 27 ++++++++++++++++++- 5 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/api/flowable-designer/index.js b/src/api/flowable-designer/index.js index 7af7b7d..be21dd5 100644 --- a/src/api/flowable-designer/index.js +++ b/src/api/flowable-designer/index.js @@ -9,7 +9,7 @@ import request from '@/utils/request' // 创建模型 export function addModel (data) { return request({ - url: '/app/rest/models', + url: '/workflow_proxy/app/rest/models', method: 'post', data: data }) @@ -21,7 +21,7 @@ export function editModel (modelId, data) { headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' }, - url: '/workflow/model/saveModel/' + modelId, + url: '/workflow_proxy/workflow/model/saveModel/' + modelId, method: 'post', data: data }) @@ -30,7 +30,7 @@ export function editModel (modelId, data) { // 部署模型 export function deployModel (query) { return request({ - url: '/workflow/model/deploy', + url: '/workflow_proxy/workflow/model/deploy', method: 'post', params: query }) @@ -39,7 +39,7 @@ export function deployModel (query) { // 活动扩展属性保存 export function activityExtensionPropertySave (data) { return request({ - url: '/workflow/extension/activityExtensionProperty/save', + url: '/workflow_proxy/workflow/extension/activityExtensionProperty/save', method: 'post', data: data }) @@ -48,7 +48,7 @@ export function activityExtensionPropertySave (data) { // 活动扩展属性数据保存 export function activityExtensionDataSave (data) { return request({ - url: '/workflow/extension/activityExtensionData/save', + url: '/workflow_proxy/workflow/extension/activityExtensionData/save', method: 'post', data: data }) diff --git a/src/api/panel/index.js b/src/api/panel/index.js index 31f1a7d..55e524a 100644 --- a/src/api/panel/index.js +++ b/src/api/panel/index.js @@ -9,7 +9,7 @@ import request from '@/utils/request' // 查询角色列表 export function listRole (query) { return request({ - url: '/system/role/list', + url: '/system_proxy/system/role/list', method: 'get', params: query }) @@ -18,7 +18,7 @@ export function listRole (query) { // 查询部门下拉树结构 export function deptTree () { return request({ - url: '/system/dept/deptTree', + url: '/system_proxy/system/dept/deptTree', method: 'get' }) } @@ -26,7 +26,7 @@ export function deptTree () { // 查询用户列表 export function listUser (query) { return request({ - url: '/system/user/list', + url: '/system_proxy/system/user/list', method: 'get', params: query }) @@ -35,7 +35,7 @@ export function listUser (query) { // 查询部门详细 export function getDept (deptId) { return request({ - url: '/system/dept/' + deptId, + url: '/system_proxy/system/dept/' + deptId, method: 'get' }) } @@ -43,7 +43,7 @@ export function getDept (deptId) { // 查询表单管理列表 export function listForm (query) { return request({ - url: '/workflow/extension/formDefinition/list', + url: '/workflow_proxy/workflow/extension/formDefinition/list', method: 'get', params: query }) @@ -52,7 +52,7 @@ export function listForm (query) { // 查询常用按钮列表 export function listButton (query) { return request({ - url: '/workflow/extension/button/list', + url: '/workflow_proxy/workflow/extension/button/list', method: 'get', params: query }) @@ -61,15 +61,18 @@ export function listButton (query) { // 查询多个用户详细 export function getUserByIds (ids) { return request({ - url: '/system/user/getByIds/' + ids, - method: 'get' + url: '/system_proxy/system/user/getByIds/' + ids, + method: 'get', + params: { + + } }) } // 查询多个角色详细 export function getRoleByIds (ids) { return request({ - url: '/system/role/getByIds/' + ids, + url: '/system_proxy/system/role/getByIds/' + ids, method: 'get' }) } @@ -77,7 +80,7 @@ export function getRoleByIds (ids) { // 查询流程表达式列表 export function listCondition (query) { return request({ - url: '/workflow/extension/condition/list', + url: '/workflow_proxy/workflow/extension/condition/list', method: 'get', params: query }) @@ -86,7 +89,7 @@ export function listCondition (query) { // 查询监听器列表 export function listListener (query) { return request({ - url: 'workflow_proxy/workflow/extension/listener/list', + url: '/workflow_proxy/workflow/extension/listener/list', method: 'get', params: query }) diff --git a/src/components/Panel/Popups/StaffAssignmentsTemplate/index.vue b/src/components/Panel/Popups/StaffAssignmentsTemplate/index.vue index 2f73401..92f19c9 100644 --- a/src/components/Panel/Popups/StaffAssignmentsTemplate/index.vue +++ b/src/components/Panel/Popups/StaffAssignmentsTemplate/index.vue @@ -45,7 +45,7 @@ label: 'name', children: 'children' }" - url="/system/dept/deptTree" + url="/system_proxy/system/dept/deptTree" :value="scope.row.assignIds" :clearable="true" :accordion="true" diff --git a/src/components/Panel/Popups/UserSelectTemplate/index.vue b/src/components/Panel/Popups/UserSelectTemplate/index.vue index ea3492f..cce44dc 100644 --- a/src/components/Panel/Popups/UserSelectTemplate/index.vue +++ b/src/components/Panel/Popups/UserSelectTemplate/index.vue @@ -34,8 +34,8 @@ - - + - + @@ -81,7 +81,7 @@
- {{ tag.userName }} + {{ tag.username }}
@@ -143,7 +143,7 @@ export default { this.queryParams = { current: 1, size: 10, - userName: undefined, + username: undefined, deptId: undefined, status: 0 } diff --git a/src/utils/request.js b/src/utils/request.js index d9d24d6..e88d049 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,9 @@ import axios from 'axios' import qs from 'qs' import { checkUrl } from './index' + +// todo: 开发测试下使用 +import { Message } from 'element-ui' window.$glob = { url: process.env.VUE_APP_BASE_API, ticket: '', @@ -42,8 +45,30 @@ axios.interceptors.request.use(config => { }) axios.interceptors.response.use(config => { - return config + const message = config.data.msg + if (config.data?.code !== 200) { + Message({ + message: message, + type: 'error' + }) + return Promise.reject(new Error(message)) + } + return config.data }, error => { + let { msg } = error; + if (msg === "Network Error") { + msg = "后端接口连接异常"; + } + else if (msg.includes("timeout")) { + msg = "系统接口请求超时"; + } + else if (msg.includes("Request failed with status code")) { + msg = "系统接口" + msg.substr(msg.length - 3) + "异常"; + } + Message({ + message: msg, + type: 'error' + }) return Promise.reject(new Error(error)) })