From b689f6a51d95cad62b92a480d30d66f21be96492 Mon Sep 17 00:00:00 2001 From: hanjian <272005125@qq.com> Date: Mon, 2 Sep 2024 08:40:29 +0800 Subject: [PATCH] update --- .env.development | 2 +- public/index.html | 4 +- src/api/tool/{userApply.js => toolApply.js} | 12 +- src/components/MonitorDrawer/index.vue | 15 +- src/views/tool/index.vue | 2 +- .../workflowList/addWorkflow/tool_release.vue | 203 ++++++------ .../workflowList/addWorkflow/use_apply.vue | 156 +++++---- src/views/workstuff/apply/index.vue | 296 +++++++++++++----- src/views/workstuff/dispose/index.vue | 30 +- vue.config.js | 7 + 10 files changed, 464 insertions(+), 263 deletions(-) rename src/api/tool/{userApply.js => toolApply.js} (79%) diff --git a/.env.development b/.env.development index 3b7e03a..cd871ae 100644 --- a/.env.development +++ b/.env.development @@ -14,7 +14,7 @@ VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket' VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view' # 流程管理服务地址 -VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.18:8085/ebpm-process-manage' +VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/public/index.html b/public/index.html index 925455c..b4c517f 100644 --- a/public/index.html +++ b/public/index.html @@ -197,12 +197,12 @@
-
+
diff --git a/src/api/tool/userApply.js b/src/api/tool/toolApply.js similarity index 79% rename from src/api/tool/userApply.js rename to src/api/tool/toolApply.js index 339e730..5237c71 100644 --- a/src/api/tool/userApply.js +++ b/src/api/tool/toolApply.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询使用申请列表 export function listApply(query) { return request({ - url: '/use/apply/list', + url: '/tool/apply/list', method: 'get', params: query }) @@ -12,14 +12,14 @@ export function listApply(query) { // 查询使用申请详细 export function getApply(id) { return request({ - url: '/use/apply/' + id, + url: '/tool/apply/' + id, method: 'get' }) } export function getInfoByBpmcId(bpmcId) { return request({ - url: '/use/apply/bpmc/' + bpmcId, + url: '/tool/apply/bpmc/' + bpmcId, method: 'get' }) } @@ -27,7 +27,7 @@ export function getInfoByBpmcId(bpmcId) { // 新增使用申请 export function addApply(data) { return request({ - url: '/use/apply', + url: '/tool/apply', method: 'post', data: data }) @@ -36,7 +36,7 @@ export function addApply(data) { // 修改使用申请 export function updateApply(data) { return request({ - url: '/use/apply/edit', + url: '/tool/apply/edit', method: 'post', data: data }) @@ -45,7 +45,7 @@ export function updateApply(data) { // 删除使用申请 export function delApply(id) { return request({ - url: '/use/apply/' + id, + url: '/tool/apply/' + id, method: 'delete' }) } diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue index fb17495..81db554 100644 --- a/src/components/MonitorDrawer/index.vue +++ b/src/components/MonitorDrawer/index.vue @@ -1,11 +1,17 @@ diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue index 9443586..365eddf 100644 --- a/src/views/workstuff/dispose/index.vue +++ b/src/views/workstuff/dispose/index.vue @@ -14,7 +14,7 @@ - + @@ -32,10 +32,16 @@ - + - + @@ -53,10 +59,16 @@ - + - + @@ -76,7 +88,13 @@ - + diff --git a/vue.config.js b/vue.config.js index b1b1454..876cbf4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,6 +40,13 @@ module.exports = { pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' } + }, + [process.env.VUE_APP_WORKFLOW_MANAGE_URL]: { + target: `http://124.223.108.21:9080/ebpm-process-manage`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_WORKFLOW_MANAGE_URL]: '' + } } }, disableHostCheck: true