From 9602e6076b1c74f11ef6bf40055be654daab32b6 Mon Sep 17 00:00:00 2001
From: smallwei <1634566606@qq.com>
Date: Wed, 29 Mar 2023 22:36:34 +0800
Subject: [PATCH] fix:more and more bug
---
src/api/base/region.js | 12 ++++++------
src/api/desk/notice.js | 12 ++++++------
src/api/flow/flow.js | 26 +++++++++++++-------------
src/api/logs.js | 14 +++++++-------
src/api/report/report.js | 6 +++---
src/api/resource/attach.js | 12 ++++++------
src/api/resource/oss.js | 14 +++++++-------
src/api/resource/sms.js | 16 ++++++++--------
src/api/system/client.js | 12 ++++++------
src/api/system/dept.js | 18 +++++++++---------
src/api/system/dict.js | 20 ++++++++++----------
src/api/system/dictbiz.js | 20 ++++++++++----------
src/api/system/menu.js | 24 ++++++++++++------------
src/api/system/param.js | 10 +++++-----
src/api/system/post.js | 14 +++++++-------
src/api/system/role.js | 20 ++++++++++----------
src/api/system/scope.js | 22 +++++++++++-----------
src/api/system/tenant.js | 22 +++++++++++-----------
src/api/system/tenantpackage.js | 12 ++++++------
src/api/system/topmenu.js | 18 +++++++++---------
src/api/system/user.js | 28 ++++++++++++++--------------
src/api/tool/code.js | 16 ++++++++--------
src/api/tool/datasource.js | 12 ++++++------
src/api/tool/model.js | 24 ++++++++++++------------
src/api/user.js | 24 ++++++++++++------------
src/api/work/process.js | 8 ++++----
src/api/work/work.js | 16 ++++++++--------
src/axios.js | 3 +++
src/components/avue-ueditor/main.vue | 22 ++++++++++++++++------
src/mac/index.vue | 5 +++--
src/page/index/top/top-lang.vue | 2 --
src/page/index/top/top-theme.vue | 5 +++--
src/permission.js | 2 +-
src/views/authority/apiscope.vue | 6 +++---
src/views/authority/datascope.vue | 6 +++---
src/views/authority/role.vue | 4 ++--
src/views/base/region.vue | 6 +++---
src/views/desk/notice.vue | 6 +++---
src/views/flow/deploy.vue | 4 ++--
src/views/flow/manager.vue | 4 ++--
src/views/flow/model.vue | 6 +++---
src/views/resource/oss.vue | 4 ++--
src/views/resource/sms.vue | 4 ++--
src/views/system/dept.vue | 8 ++++----
src/views/system/dict.vue | 4 ++--
src/views/system/dictbiz.vue | 4 ++--
src/views/system/post.vue | 6 +++---
src/views/system/tenant.vue | 6 +++---
src/views/system/user.vue | 10 +++++-----
src/views/tool/code.vue | 12 ++++++------
src/views/util/demo/dict.vue | 8 ++++----
src/views/util/demo/dictbiz.vue | 8 ++++----
src/views/work/claim.vue | 4 ++--
src/views/work/done.vue | 4 ++--
src/views/work/send.vue | 4 ++--
src/views/work/start.vue | 4 ++--
src/views/work/todo.vue | 4 ++--
57 files changed, 320 insertions(+), 307 deletions(-)
diff --git a/src/api/base/region.js b/src/api/base/region.js
index 5682ed4..381fc6b 100644
--- a/src/api/base/region.js
+++ b/src/api/base/region.js
@@ -1,8 +1,8 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/region/list',
+ url: '/blade-system/region/list',
method: 'get',
params: {
...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
export const getLazyTree = (parentCode, params) => {
return request({
- url: baseUrl + '/blade-system/region/lazy-tree',
+ url: '/blade-system/region/lazy-tree',
method: 'get',
params: {
...params,
@@ -25,7 +25,7 @@ export const getLazyTree = (parentCode, params) => {
export const getDetail = (code) => {
return request({
- url: baseUrl + '/blade-system/region/detail',
+ url: '/blade-system/region/detail',
method: 'get',
params: {
code
@@ -35,7 +35,7 @@ export const getDetail = (code) => {
export const remove = (id) => {
return request({
- url: baseUrl + '/blade-system/region/remove',
+ url: '/blade-system/region/remove',
method: 'post',
params: {
id,
@@ -45,7 +45,7 @@ export const remove = (id) => {
export const submit = (row) => {
return request({
- url: baseUrl + '/blade-system/region/submit',
+ url: '/blade-system/region/submit',
method: 'post',
data: row
})
diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js
index 4098b8c..e195edd 100644
--- a/src/api/desk/notice.js
+++ b/src/api/desk/notice.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-desk/notice/list',
+ url: '/blade-desk/notice/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-desk/notice/remove',
+ url: '/blade-desk/notice/remove',
method: 'post',
params: {
ids,
@@ -26,7 +26,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-desk/notice/submit',
+ url: '/blade-desk/notice/submit',
method: 'post',
data: row
})
@@ -34,7 +34,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-desk/notice/submit',
+ url: '/blade-desk/notice/submit',
method: 'post',
data: row
})
@@ -42,7 +42,7 @@ export const update = (row) => {
export const getNotice = (id) => {
return request({
- url: baseUrl + '/blade-desk/notice/detail',
+ url: '/blade-desk/notice/detail',
method: 'get',
params: {
id
diff --git a/src/api/flow/flow.js b/src/api/flow/flow.js
index 8cf0ff0..bc2b836 100644
--- a/src/api/flow/flow.js
+++ b/src/api/flow/flow.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const modelList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/model/list',
+ url: '/blade-flow/model/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const modelList = (current, size, params) => {
export const managerList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/manager/list',
+ url: '/blade-flow/manager/list',
method: 'get',
params: {
...params,
@@ -28,7 +28,7 @@ export const managerList = (current, size, params) => {
export const followList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/follow/list',
+ url: '/blade-flow/follow/list',
method: 'get',
params: {
...params,
@@ -41,7 +41,7 @@ export const followList = (current, size, params) => {
export const removeModel = (ids) => {
return request({
- url: baseUrl + '/blade-flow/model/remove',
+ url: '/blade-flow/model/remove',
method: 'post',
params: {
ids,
@@ -51,7 +51,7 @@ export const removeModel = (ids) => {
export const deployModel = (params) => {
return request({
- url: baseUrl + '/blade-flow/model/deploy',
+ url: '/blade-flow/model/deploy',
method: 'post',
params
})
@@ -59,7 +59,7 @@ export const deployModel = (params) => {
export const changeState = (params) => {
return request({
- url: baseUrl + '/blade-flow/manager/change-state',
+ url: '/blade-flow/manager/change-state',
method: 'post',
params
})
@@ -76,7 +76,7 @@ export const deployUpload = (category, tenantIds, files) => {
headers: {
"Content-Type": "multipart/form-data"
},
- url: baseUrl + '/blade-flow/manager/deploy-upload',
+ url: '/blade-flow/manager/deploy-upload',
method: 'post',
data: formData
})
@@ -84,7 +84,7 @@ export const deployUpload = (category, tenantIds, files) => {
export const deleteDeployment = (deploymentIds) => {
return request({
- url: baseUrl + '/blade-flow/manager/delete-deployment',
+ url: '/blade-flow/manager/delete-deployment',
method: 'post',
params: {
deploymentIds,
@@ -94,7 +94,7 @@ export const deleteDeployment = (deploymentIds) => {
export const deleteProcessInstance = (params) => {
return request({
- url: baseUrl + '/blade-flow/follow/delete-process-instance',
+ url: '/blade-flow/follow/delete-process-instance',
method: 'post',
params
})
@@ -102,7 +102,7 @@ export const deleteProcessInstance = (params) => {
export const submitModel = (data) => {
return request({
- url: baseUrl + '/blade-flow/model/submit',
+ url: '/blade-flow/model/submit',
method: 'post',
data
})
@@ -110,7 +110,7 @@ export const submitModel = (data) => {
export const detail = (params) => {
return request({
- url: baseUrl + '/blade-flow/model/detail',
+ url: '/blade-flow/model/detail',
method: 'get',
params
})
@@ -118,7 +118,7 @@ export const detail = (params) => {
export const modelView = (params) => {
return request({
- url: baseUrl + '/blade-flow/process/model-view',
+ url: '/blade-flow/process/model-view',
method: 'get',
params
})
diff --git a/src/api/logs.js b/src/api/logs.js
index 81bd02c..40162ad 100644
--- a/src/api/logs.js
+++ b/src/api/logs.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getUsualList = (current, size) => {
return request({
- url: baseUrl + '/blade-log/usual/list',
+ url: '/blade-log/usual/list',
method: 'get',
params: {
current,
@@ -15,7 +15,7 @@ export const getUsualList = (current, size) => {
export const getApiList = (current, size) => {
return request({
- url: baseUrl + '/blade-log/api/list',
+ url: '/blade-log/api/list',
method: 'get',
params: {
current,
@@ -26,7 +26,7 @@ export const getApiList = (current, size) => {
export const getErrorList = (current, size) => {
return request({
- url: baseUrl + '/blade-log/error/list',
+ url: '/blade-log/error/list',
method: 'get',
params: {
current,
@@ -38,7 +38,7 @@ export const getErrorList = (current, size) => {
export const getUsualLogs = (id) => {
return request({
- url: baseUrl + '/blade-log/usual/detail',
+ url: '/blade-log/usual/detail',
method: 'get',
params: {
id,
@@ -47,7 +47,7 @@ export const getUsualLogs = (id) => {
}
export const getApiLogs = (id) => {
return request({
- url: baseUrl + '/blade-log/api/detail',
+ url: '/blade-log/api/detail',
method: 'get',
params: {
id,
@@ -56,7 +56,7 @@ export const getApiLogs = (id) => {
}
export const getErrorLogs = (id) => {
return request({
- url: baseUrl + '/blade-log/error/detail',
+ url: '/blade-log/error/detail',
method: 'get',
params: {
id,
diff --git a/src/api/report/report.js b/src/api/report/report.js
index 5aaa978..aa2c8b3 100644
--- a/src/api/report/report.js
+++ b/src/api/report/report.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-report/report/rest/list',
+ url: '/blade-report/report/rest/list',
method: 'get',
params: {
...params,
@@ -15,7 +15,7 @@ export const getList = (current, size, params) => {
}
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-report/report/rest/remove',
+ url: '/blade-report/report/rest/remove',
method: 'post',
params: {
ids,
diff --git a/src/api/resource/attach.js b/src/api/resource/attach.js
index 4b7ac14..99ca780 100644
--- a/src/api/resource/attach.js
+++ b/src/api/resource/attach.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-resource/attach/list',
+ url: '/blade-resource/attach/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-resource/attach/detail',
+ url: '/blade-resource/attach/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-resource/attach/remove',
+ url: '/blade-resource/attach/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-resource/attach/submit',
+ url: '/blade-resource/attach/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-resource/attach/submit',
+ url: '/blade-resource/attach/submit',
method: 'post',
data: row
})
diff --git a/src/api/resource/oss.js b/src/api/resource/oss.js
index bdcf0f5..002af89 100644
--- a/src/api/resource/oss.js
+++ b/src/api/resource/oss.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-resource/oss/list',
+ url: '/blade-resource/oss/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-resource/oss/detail',
+ url: '/blade-resource/oss/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-resource/oss/remove',
+ url: '/blade-resource/oss/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-resource/oss/submit',
+ url: '/blade-resource/oss/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-resource/oss/submit',
+ url: '/blade-resource/oss/submit',
method: 'post',
data: row
})
@@ -52,7 +52,7 @@ export const update = (row) => {
export const enable = (id) => {
return request({
- url: baseUrl + '/blade-resource/oss/enable',
+ url: '/blade-resource/oss/enable',
method: 'post',
params: {
id
diff --git a/src/api/resource/sms.js b/src/api/resource/sms.js
index 87a9004..b78e250 100644
--- a/src/api/resource/sms.js
+++ b/src/api/resource/sms.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-resource/sms/list',
+ url: '/blade-resource/sms/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-resource/sms/detail',
+ url: '/blade-resource/sms/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-resource/sms/remove',
+ url: '/blade-resource/sms/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-resource/sms/submit',
+ url: '/blade-resource/sms/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-resource/sms/submit',
+ url: '/blade-resource/sms/submit',
method: 'post',
data: row
})
@@ -52,7 +52,7 @@ export const update = (row) => {
export const enable = (id) => {
return request({
- url: baseUrl + '/blade-resource/sms/enable',
+ url: '/blade-resource/sms/enable',
method: 'post',
params: {
id
@@ -62,7 +62,7 @@ export const enable = (id) => {
export const send = (code, phones, params) => {
return request({
- url: baseUrl + '/blade-resource/sms/endpoint/send-message',
+ url: '/blade-resource/sms/endpoint/send-message',
method: 'post',
params: {
code,
diff --git a/src/api/system/client.js b/src/api/system/client.js
index a12ef33..9a7e7c4 100644
--- a/src/api/system/client.js
+++ b/src/api/system/client.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/client/list',
+ url: '/blade-system/client/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-system/client/detail',
+ url: '/blade-system/client/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/client/remove',
+ url: '/blade-system/client/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/client/submit',
+ url: '/blade-system/client/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/client/submit',
+ url: '/blade-system/client/submit',
method: 'post',
data: row
})
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 5ec7a80..7e8bc60 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/dept/list',
+ url: '/blade-system/dept/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getLazyList = (parentId, params) => {
return request({
- url: baseUrl + '/blade-system/dept/lazy-list',
+ url: '/blade-system/dept/lazy-list',
method: 'get',
params: {
...params,
@@ -27,7 +27,7 @@ export const getLazyList = (parentId, params) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/dept/remove',
+ url: '/blade-system/dept/remove',
method: 'post',
params: {
ids,
@@ -37,7 +37,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/dept/submit',
+ url: '/blade-system/dept/submit',
method: 'post',
data: row
})
@@ -45,7 +45,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/dept/submit',
+ url: '/blade-system/dept/submit',
method: 'post',
data: row
})
@@ -53,7 +53,7 @@ export const update = (row) => {
export const getDept = (id) => {
return request({
- url: baseUrl + '/blade-system/dept/detail',
+ url: '/blade-system/dept/detail',
method: 'get',
params: {
id,
@@ -63,7 +63,7 @@ export const getDept = (id) => {
export const getDeptTree = (tenantId) => {
return request({
- url: baseUrl + '/blade-system/dept/tree',
+ url: '/blade-system/dept/tree',
method: 'get',
params: {
tenantId,
@@ -73,7 +73,7 @@ export const getDeptTree = (tenantId) => {
export const getDeptLazyTree = (parentId) => {
return request({
- url: baseUrl + '/blade-system/dept/lazy-tree',
+ url: '/blade-system/dept/lazy-tree',
method: 'get',
params: {
parentId
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index e10a80b..c01f472 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/dict/list',
+ url: '/blade-system/dict/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getParentList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/dict/parent-list',
+ url: '/blade-system/dict/parent-list',
method: 'get',
params: {
...params,
@@ -28,7 +28,7 @@ export const getParentList = (current, size, params) => {
export const getChildList = (current, size, parentId, params) => {
return request({
- url: baseUrl + '/blade-system/dict/child-list',
+ url: '/blade-system/dict/child-list',
method: 'get',
params: {
...params,
@@ -41,7 +41,7 @@ export const getChildList = (current, size, parentId, params) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/dict/remove',
+ url: '/blade-system/dict/remove',
method: 'post',
params: {
ids,
@@ -51,7 +51,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/dict/submit',
+ url: '/blade-system/dict/submit',
method: 'post',
data: row
})
@@ -59,7 +59,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/dict/submit',
+ url: '/blade-system/dict/submit',
method: 'post',
data: row
})
@@ -68,7 +68,7 @@ export const update = (row) => {
export const getDict = (id) => {
return request({
- url: baseUrl + '/blade-system/dict/detail',
+ url: '/blade-system/dict/detail',
method: 'get',
params: {
id,
@@ -77,14 +77,14 @@ export const getDict = (id) => {
}
export const getDictTree = () => {
return request({
- url: baseUrl + '/blade-system/dict/tree?code=DICT',
+ url: '/blade-system/dict/tree?code=DICT',
method: 'get'
})
}
export const getDictionary = (params) => {
return request({
- url: baseUrl + '/blade-system/dict/dictionary',
+ url: '/blade-system/dict/dictionary',
method: 'get',
params,
})
diff --git a/src/api/system/dictbiz.js b/src/api/system/dictbiz.js
index a6cc2bf..0764fbd 100644
--- a/src/api/system/dictbiz.js
+++ b/src/api/system/dictbiz.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/list',
+ url: '/blade-system/dict-biz/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getParentList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/parent-list',
+ url: '/blade-system/dict-biz/parent-list',
method: 'get',
params: {
...params,
@@ -28,7 +28,7 @@ export const getParentList = (current, size, params) => {
export const getChildList = (current, size, parentId, params) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/child-list',
+ url: '/blade-system/dict-biz/child-list',
method: 'get',
params: {
...params,
@@ -41,7 +41,7 @@ export const getChildList = (current, size, parentId, params) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/remove',
+ url: '/blade-system/dict-biz/remove',
method: 'post',
params: {
ids,
@@ -51,7 +51,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/submit',
+ url: '/blade-system/dict-biz/submit',
method: 'post',
data: row
})
@@ -59,7 +59,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/submit',
+ url: '/blade-system/dict-biz/submit',
method: 'post',
data: row
})
@@ -68,7 +68,7 @@ export const update = (row) => {
export const getDict = (id) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/detail',
+ url: '/blade-system/dict-biz/detail',
method: 'get',
params: {
id,
@@ -77,14 +77,14 @@ export const getDict = (id) => {
}
export const getDictTree = () => {
return request({
- url: baseUrl + '/blade-system/dict-biz/tree?code=DICT',
+ url: '/blade-system/dict-biz/tree?code=DICT',
method: 'get'
})
}
export const getDictionary = (params) => {
return request({
- url: baseUrl + '/blade-system/dict-biz/dictionary',
+ url: '/blade-system/dict-biz/dictionary',
method: 'get',
params,
})
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 7748c34..3a78cf5 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/menu/list',
+ url: '/blade-system/menu/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getLazyList = (parentId, params) => {
return request({
- url: baseUrl + '/blade-system/menu/lazy-list',
+ url: '/blade-system/menu/lazy-list',
method: 'get',
params: {
...params,
@@ -27,7 +27,7 @@ export const getLazyList = (parentId, params) => {
export const getLazyMenuList = (parentId, params) => {
return request({
- url: baseUrl + '/blade-system/menu/lazy-menu-list',
+ url: '/blade-system/menu/lazy-menu-list',
method: 'get',
params: {
...params,
@@ -38,7 +38,7 @@ export const getLazyMenuList = (parentId, params) => {
export const getMenuList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/menu/menu-list',
+ url: '/blade-system/menu/menu-list',
method: 'get',
params: {
...params,
@@ -50,7 +50,7 @@ export const getMenuList = (current, size, params) => {
export const getMenuTree = (tenantId) => {
return request({
- url: baseUrl + '/blade-system/menu/tree',
+ url: '/blade-system/menu/tree',
method: 'get',
params: {
tenantId,
@@ -60,7 +60,7 @@ export const getMenuTree = (tenantId) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/menu/remove',
+ url: '/blade-system/menu/remove',
method: 'post',
params: {
ids,
@@ -70,7 +70,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/menu/submit',
+ url: '/blade-system/menu/submit',
method: 'post',
data: row
})
@@ -78,7 +78,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/menu/submit',
+ url: '/blade-system/menu/submit',
method: 'post',
data: row
})
@@ -86,7 +86,7 @@ export const update = (row) => {
export const getMenu = (id) => {
return request({
- url: baseUrl + '/blade-system/menu/detail',
+ url: '/blade-system/menu/detail',
method: 'get',
params: {
id,
@@ -95,12 +95,12 @@ export const getMenu = (id) => {
}
export const getTopMenu = () => request({
- url: baseUrl + '/blade-system/menu/top-menu',
+ url: '/blade-system/menu/top-menu',
method: 'get'
});
export const getRoutes = (topMenuId) => request({
- url: baseUrl + '/blade-system/menu/routes',
+ url: '/blade-system/menu/routes',
method: 'get',
params: {
topMenuId,
diff --git a/src/api/system/param.js b/src/api/system/param.js
index 0652238..d81f8e3 100644
--- a/src/api/system/param.js
+++ b/src/api/system/param.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/param/list',
+ url: '/blade-system/param/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/param/remove',
+ url: '/blade-system/param/remove',
method: 'post',
params: {
ids,
@@ -26,7 +26,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/param/submit',
+ url: '/blade-system/param/submit',
method: 'post',
data: row
})
@@ -34,7 +34,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/param/submit',
+ url: '/blade-system/param/submit',
method: 'post',
data: row
})
diff --git a/src/api/system/post.js b/src/api/system/post.js
index c9ad73d..af2f17a 100644
--- a/src/api/system/post.js
+++ b/src/api/system/post.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/post/list',
+ url: '/blade-system/post/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getPostList = (tenantId) => {
return request({
- url: baseUrl + '/blade-system/post/select',
+ url: '/blade-system/post/select',
method: 'get',
params: {
tenantId
@@ -26,7 +26,7 @@ export const getPostList = (tenantId) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-system/post/detail',
+ url: '/blade-system/post/detail',
method: 'get',
params: {
id
@@ -36,7 +36,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/post/remove',
+ url: '/blade-system/post/remove',
method: 'post',
params: {
ids,
@@ -46,7 +46,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/post/submit',
+ url: '/blade-system/post/submit',
method: 'post',
data: row
})
@@ -54,7 +54,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/post/submit',
+ url: '/blade-system/post/submit',
method: 'post',
data: row
})
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 24b3e5f..82e6ab7 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/role/list',
+ url: '/blade-system/role/list',
method: 'get',
params: {
...params,
@@ -15,14 +15,14 @@ export const getList = (current, size, params) => {
}
export const grantTree = () => {
return request({
- url: baseUrl + '/blade-system/menu/grant-tree',
+ url: '/blade-system/menu/grant-tree',
method: 'get',
})
}
export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
return request({
- url: baseUrl + '/blade-system/role/grant',
+ url: '/blade-system/role/grant',
method: 'post',
data: {
roleIds,
@@ -35,7 +35,7 @@ export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/role/remove',
+ url: '/blade-system/role/remove',
method: 'post',
params: {
ids,
@@ -45,7 +45,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/role/submit',
+ url: '/blade-system/role/submit',
method: 'post',
data: row
})
@@ -53,7 +53,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/role/submit',
+ url: '/blade-system/role/submit',
method: 'post',
data: row
})
@@ -62,7 +62,7 @@ export const update = (row) => {
export const getRole = (roleIds) => {
return request({
- url: baseUrl + '/blade-system/menu/role-tree-keys',
+ url: '/blade-system/menu/role-tree-keys',
method: 'get',
params: {
roleIds,
@@ -72,7 +72,7 @@ export const getRole = (roleIds) => {
export const getRoleTree = (tenantId) => {
return request({
- url: baseUrl + '/blade-system/role/tree',
+ url: '/blade-system/role/tree',
method: 'get',
params: {
tenantId,
@@ -82,7 +82,7 @@ export const getRoleTree = (tenantId) => {
export const getRoleTreeById = (roleId) => {
return request({
- url: baseUrl + '/blade-system/role/tree-by-id',
+ url: '/blade-system/role/tree-by-id',
method: 'get',
params: {
roleId,
diff --git a/src/api/system/scope.js b/src/api/system/scope.js
index 7329bc0..81b443b 100644
--- a/src/api/system/scope.js
+++ b/src/api/system/scope.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getListDataScope = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/data-scope/list',
+ url: '/blade-system/data-scope/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getListDataScope = (current, size, params) => {
export const removeDataScope = (ids) => {
return request({
- url: baseUrl + '/blade-system/data-scope/remove',
+ url: '/blade-system/data-scope/remove',
method: 'post',
params: {
ids,
@@ -26,7 +26,7 @@ export const removeDataScope = (ids) => {
export const addDataScope = (row) => {
return request({
- url: baseUrl + '/blade-system/data-scope/submit',
+ url: '/blade-system/data-scope/submit',
method: 'post',
data: row
})
@@ -34,7 +34,7 @@ export const addDataScope = (row) => {
export const updateDataScope = (row) => {
return request({
- url: baseUrl + '/blade-system/data-scope/submit',
+ url: '/blade-system/data-scope/submit',
method: 'post',
data: row
})
@@ -42,7 +42,7 @@ export const updateDataScope = (row) => {
export const getMenuDataScope = (id) => {
return request({
- url: baseUrl + '/blade-system/data-scope/detail',
+ url: '/blade-system/data-scope/detail',
method: 'get',
params: {
id,
@@ -52,7 +52,7 @@ export const getMenuDataScope = (id) => {
export const getListApiScope = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/api-scope/list',
+ url: '/blade-system/api-scope/list',
method: 'get',
params: {
...params,
@@ -64,7 +64,7 @@ export const getListApiScope = (current, size, params) => {
export const removeApiScope = (ids) => {
return request({
- url: baseUrl + '/blade-system/api-scope/remove',
+ url: '/blade-system/api-scope/remove',
method: 'post',
params: {
ids,
@@ -74,7 +74,7 @@ export const removeApiScope = (ids) => {
export const addApiScope = (row) => {
return request({
- url: baseUrl + '/blade-system/api-scope/submit',
+ url: '/blade-system/api-scope/submit',
method: 'post',
data: row
})
@@ -82,7 +82,7 @@ export const addApiScope = (row) => {
export const updateApiScope = (row) => {
return request({
- url: baseUrl + '/blade-system/api-scope/submit',
+ url: '/blade-system/api-scope/submit',
method: 'post',
data: row
})
@@ -90,7 +90,7 @@ export const updateApiScope = (row) => {
export const getMenuApiScope = (id) => {
return request({
- url: baseUrl + '/blade-system/api-scope/detail',
+ url: '/blade-system/api-scope/detail',
method: 'get',
params: {
id,
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index c639601..ac3f068 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/tenant/list',
+ url: '/blade-system/tenant/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-system/tenant/detail',
+ url: '/blade-system/tenant/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/tenant/remove',
+ url: '/blade-system/tenant/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/tenant/submit',
+ url: '/blade-system/tenant/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/tenant/submit',
+ url: '/blade-system/tenant/submit',
method: 'post',
data: row
})
@@ -52,7 +52,7 @@ export const update = (row) => {
export const setting = (ids, form) => {
return request({
- url: baseUrl + '/blade-system/tenant/setting',
+ url: '/blade-system/tenant/setting',
method: 'post',
params: {
...form,
@@ -63,7 +63,7 @@ export const setting = (ids, form) => {
export const datasource = (tenantId, datasourceId) => {
return request({
- url: baseUrl + '/blade-system/tenant/datasource',
+ url: '/blade-system/tenant/datasource',
method: 'post',
params: {
tenantId,
@@ -74,7 +74,7 @@ export const datasource = (tenantId, datasourceId) => {
export const info = (domain) => {
return request({
- url: baseUrl + '/blade-system/tenant/info',
+ url: '/blade-system/tenant/info',
method: 'get',
params: {
domain
@@ -84,7 +84,7 @@ export const info = (domain) => {
export const packageInfo = (tenantId) => {
return request({
- url: baseUrl + '/blade-system/tenant/package-detail',
+ url: '/blade-system/tenant/package-detail',
method: 'get',
params: {
tenantId
@@ -94,7 +94,7 @@ export const packageInfo = (tenantId) => {
export const packageSetting = (tenantId, packageId) => {
return request({
- url: baseUrl + '/blade-system/tenant/package-setting',
+ url: '/blade-system/tenant/package-setting',
method: 'post',
params: {
tenantId,
diff --git a/src/api/system/tenantpackage.js b/src/api/system/tenantpackage.js
index 02ae3d1..d4485e5 100644
--- a/src/api/system/tenantpackage.js
+++ b/src/api/system/tenantpackage.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/tenant-package/list',
+ url: '/blade-system/tenant-package/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-system/tenant-package/detail',
+ url: '/blade-system/tenant-package/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/tenant-package/remove',
+ url: '/blade-system/tenant-package/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/tenant-package/submit',
+ url: '/blade-system/tenant-package/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/tenant-package/submit',
+ url: '/blade-system/tenant-package/submit',
method: 'post',
data: row
})
diff --git a/src/api/system/topmenu.js b/src/api/system/topmenu.js
index b907bf0..a7bdbb8 100644
--- a/src/api/system/topmenu.js
+++ b/src/api/system/topmenu.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-system/topmenu/list',
+ url: '/blade-system/topmenu/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-system/topmenu/detail',
+ url: '/blade-system/topmenu/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-system/topmenu/remove',
+ url: '/blade-system/topmenu/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-system/topmenu/submit',
+ url: '/blade-system/topmenu/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-system/topmenu/submit',
+ url: '/blade-system/topmenu/submit',
method: 'post',
data: row
})
@@ -52,14 +52,14 @@ export const update = (row) => {
export const grantTree = () => {
return request({
- url: baseUrl + '/blade-system/menu/grant-top-tree',
+ url: '/blade-system/menu/grant-top-tree',
method: 'get',
})
}
export const getTopTree = (topMenuIds) => {
return request({
- url: baseUrl + '/blade-system/menu/top-tree-keys',
+ url: '/blade-system/menu/top-tree-keys',
method: 'get',
params: {
topMenuIds,
@@ -69,7 +69,7 @@ export const getTopTree = (topMenuIds) => {
export const grant = (topMenuIds, menuIds) => {
return request({
- url: baseUrl + '/blade-system/topmenu/grant',
+ url: '/blade-system/topmenu/grant',
method: 'post',
data: {
topMenuIds,
diff --git a/src/api/system/user.js b/src/api/system/user.js
index bda252b..bd77d05 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params, deptId) => {
return request({
- url: baseUrl + '/blade-user/page',
+ url: '/blade-user/page',
method: 'get',
params: {
...params,
@@ -17,7 +17,7 @@ export const getList = (current, size, params, deptId) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-user/remove',
+ url: '/blade-user/remove',
method: 'post',
params: {
ids,
@@ -27,7 +27,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-user/submit',
+ url: '/blade-user/submit',
method: 'post',
data: row
})
@@ -35,7 +35,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-user/update',
+ url: '/blade-user/update',
method: 'post',
data: row
})
@@ -43,7 +43,7 @@ export const update = (row) => {
export const updatePlatform = (userId, userType, userExt) => {
return request({
- url: baseUrl + '/blade-user/update-platform',
+ url: '/blade-user/update-platform',
method: 'post',
params: {
userId,
@@ -55,7 +55,7 @@ export const updatePlatform = (userId, userType, userExt) => {
export const getUser = (id) => {
return request({
- url: baseUrl + '/blade-user/detail',
+ url: '/blade-user/detail',
method: 'get',
params: {
id,
@@ -65,7 +65,7 @@ export const getUser = (id) => {
export const getUserPlatform = (id) => {
return request({
- url: baseUrl + '/blade-user/platform-detail',
+ url: '/blade-user/platform-detail',
method: 'get',
params: {
id,
@@ -75,14 +75,14 @@ export const getUserPlatform = (id) => {
export const getUserInfo = () => {
return request({
- url: baseUrl + '/blade-user/info',
+ url: '/blade-user/info',
method: 'get',
})
}
export const resetPassword = (userIds) => {
return request({
- url: baseUrl + '/blade-user/reset-password',
+ url: '/blade-user/reset-password',
method: 'post',
params: {
userIds,
@@ -92,7 +92,7 @@ export const resetPassword = (userIds) => {
export const updatePassword = (oldPassword, newPassword, newPassword1) => {
return request({
- url: baseUrl + '/blade-user/update-password',
+ url: '/blade-user/update-password',
method: 'post',
params: {
oldPassword,
@@ -104,7 +104,7 @@ export const updatePassword = (oldPassword, newPassword, newPassword1) => {
export const updateInfo = (row) => {
return request({
- url: baseUrl + '/blade-user/update-info',
+ url: '/blade-user/update-info',
method: 'post',
data: row
})
@@ -112,7 +112,7 @@ export const updateInfo = (row) => {
export const grant = (userIds, roleIds) => {
return request({
- url: baseUrl + '/blade-user/grant',
+ url: '/blade-user/grant',
method: 'post',
params: {
userIds,
@@ -123,7 +123,7 @@ export const grant = (userIds, roleIds) => {
export const unlock = (userIds) => {
return request({
- url: baseUrl + '/blade-user/unlock',
+ url: '/blade-user/unlock',
method: 'post',
params: {
userIds,
diff --git a/src/api/tool/code.js b/src/api/tool/code.js
index c3e3765..0ec1d36 100644
--- a/src/api/tool/code.js
+++ b/src/api/tool/code.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-develop/code/list',
+ url: '/blade-develop/code/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const build = (ids) => {
return request({
- url: baseUrl + '/blade-develop/code/gen-code',
+ url: '/blade-develop/code/gen-code',
method: 'post',
params: {
ids,
@@ -26,7 +26,7 @@ export const build = (ids) => {
}
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-develop/code/remove',
+ url: '/blade-develop/code/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-develop/code/submit',
+ url: '/blade-develop/code/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-develop/code/submit',
+ url: '/blade-develop/code/submit',
method: 'post',
data: row
})
@@ -52,7 +52,7 @@ export const update = (row) => {
export const copy = (id) => {
return request({
- url: baseUrl + '/blade-develop/code/copy',
+ url: '/blade-develop/code/copy',
method: 'post',
params: {
id,
@@ -62,7 +62,7 @@ export const copy = (id) => {
export const getCode = (id) => {
return request({
- url: baseUrl + '/blade-develop/code/detail',
+ url: '/blade-develop/code/detail',
method: 'get',
params: {
id,
diff --git a/src/api/tool/datasource.js b/src/api/tool/datasource.js
index d2ccc4d..0655ace 100644
--- a/src/api/tool/datasource.js
+++ b/src/api/tool/datasource.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-develop/datasource/list',
+ url: '/blade-develop/datasource/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-develop/datasource/detail',
+ url: '/blade-develop/datasource/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-develop/datasource/remove',
+ url: '/blade-develop/datasource/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-develop/datasource/submit',
+ url: '/blade-develop/datasource/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-develop/datasource/submit',
+ url: '/blade-develop/datasource/submit',
method: 'post',
data: row
})
diff --git a/src/api/tool/model.js b/src/api/tool/model.js
index d15a6cf..c63ff84 100644
--- a/src/api/tool/model.js
+++ b/src/api/tool/model.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const getList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-develop/model/list',
+ url: '/blade-develop/model/list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const getList = (current, size, params) => {
export const getDetail = (id) => {
return request({
- url: baseUrl + '/blade-develop/model/detail',
+ url: '/blade-develop/model/detail',
method: 'get',
params: {
id
@@ -26,7 +26,7 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
- url: baseUrl + '/blade-develop/model/remove',
+ url: '/blade-develop/model/remove',
method: 'post',
params: {
ids,
@@ -36,7 +36,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: baseUrl + '/blade-develop/model/submit',
+ url: '/blade-develop/model/submit',
method: 'post',
data: row
})
@@ -44,7 +44,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: baseUrl + '/blade-develop/model/submit',
+ url: '/blade-develop/model/submit',
method: 'post',
data: row
})
@@ -52,7 +52,7 @@ export const update = (row) => {
export const getTableList = (datasourceId) => {
return request({
- url: baseUrl + '/blade-develop/model/table-list',
+ url: '/blade-develop/model/table-list',
method: 'get',
params: {
datasourceId,
@@ -62,7 +62,7 @@ export const getTableList = (datasourceId) => {
export const getTableInfo = (modelId, datasourceId) => {
return request({
- url: baseUrl + '/blade-develop/model/table-info',
+ url: '/blade-develop/model/table-info',
method: 'get',
params: {
modelId,
@@ -73,7 +73,7 @@ export const getTableInfo = (modelId, datasourceId) => {
export const getTableInfoByName = (tableName, datasourceId) => {
return request({
- url: baseUrl + '/blade-develop/model/table-info',
+ url: '/blade-develop/model/table-info',
method: 'get',
params: {
tableName,
@@ -84,7 +84,7 @@ export const getTableInfoByName = (tableName, datasourceId) => {
export const getModelPrototype = (modelId, datasourceId) => {
return request({
- url: baseUrl + '/blade-develop/model/model-prototype',
+ url: '/blade-develop/model/model-prototype',
method: 'get',
params: {
modelId,
@@ -95,7 +95,7 @@ export const getModelPrototype = (modelId, datasourceId) => {
export const submitModelPrototype = (row) => {
return request({
- url: baseUrl + '/blade-develop/model-prototype/submit-list',
+ url: '/blade-develop/model-prototype/submit-list',
method: 'post',
data: row
})
@@ -104,7 +104,7 @@ export const submitModelPrototype = (row) => {
export const prototypeDetail = (modelId) => {
return request({
- url: baseUrl + '/blade-develop/model-prototype/select',
+ url: '/blade-develop/model-prototype/select',
method: 'get',
params: {
modelId,
diff --git a/src/api/user.js b/src/api/user.js
index a858f43..ca00e8e 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
import website from "@/config/website";
export const loginByUsername = (tenantId, deptId, roleId, username, password, type, key, code) => request({
- url: baseUrl + '/blade-auth/oauth/token',
+ url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -24,7 +24,7 @@ export const loginByUsername = (tenantId, deptId, roleId, username, password, ty
});
export const loginBySocial = (tenantId, source, code, state) => request({
- url: baseUrl + '/blade-auth/oauth/token',
+ url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId
@@ -40,7 +40,7 @@ export const loginBySocial = (tenantId, source, code, state) => request({
})
export const loginBySso = (state, code) => request({
- url: baseUrl + '/blade-auth/oauth/token',
+ url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': state
@@ -55,7 +55,7 @@ export const loginBySso = (state, code) => request({
})
export const refreshToken = (refresh_token, tenantId, deptId, roleId) => request({
- url: baseUrl + '/blade-auth/oauth/token',
+ url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -71,7 +71,7 @@ export const refreshToken = (refresh_token, tenantId, deptId, roleId) => request
});
export const registerGuest = (form, oauthId) => request({
- url: baseUrl + '/blade-user/register-guest',
+ url: '/blade-user/register-guest',
method: 'post',
params: {
tenantId: form.tenantId,
@@ -83,35 +83,35 @@ export const registerGuest = (form, oauthId) => request({
});
export const getButtons = () => request({
- url: baseUrl + '/blade-system/menu/buttons',
+ url: '/blade-system/menu/buttons',
method: 'get'
});
export const getCaptcha = () => request({
- url: baseUrl + '/blade-auth/oauth/captcha',
+ url: '/blade-auth/oauth/captcha',
method: 'get',
authorization: false
});
export const logout = () => request({
- url: baseUrl + '/blade-auth/oauth/logout',
+ url: '/blade-auth/oauth/logout',
method: 'get',
authorization: false
});
export const getUserInfo = () => request({
- url: baseUrl + '/blade-auth/oauth/user-info',
+ url: '/blade-auth/oauth/user-info',
method: 'get'
});
export const sendLogs = (list) => request({
- url: baseUrl + '/blade-auth/oauth/logout',
+ url: '/blade-auth/oauth/logout',
method: 'post',
data: list
});
export const clearCache = () => request({
- url: baseUrl + '/blade-auth/oauth/clear-cache',
+ url: '/blade-auth/oauth/clear-cache',
method: 'get',
authorization: false
});
diff --git a/src/api/work/process.js b/src/api/work/process.js
index f29077e..c544494 100644
--- a/src/api/work/process.js
+++ b/src/api/work/process.js
@@ -1,12 +1,12 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
// =====================参数===========================
export const historyFlowList = (processInstanceId) => {
return request({
- url: baseUrl + '/blade-flow/process/history-flow-list',
+ url: '/blade-flow/process/history-flow-list',
method: 'get',
params: {
processInstanceId
@@ -19,7 +19,7 @@ export const historyFlowList = (processInstanceId) => {
export const leaveProcess = (data) => {
return request({
- url: baseUrl + '/blade-desk/process/leave/start-process',
+ url: '/blade-desk/process/leave/start-process',
method: 'post',
data
})
@@ -27,7 +27,7 @@ export const leaveProcess = (data) => {
export const leaveDetail = (businessId) => {
return request({
- url: baseUrl + '/blade-desk/process/leave/detail',
+ url: '/blade-desk/process/leave/detail',
method: 'get',
params: {
businessId
diff --git a/src/api/work/work.js b/src/api/work/work.js
index 8fc08aa..8dbecc1 100644
--- a/src/api/work/work.js
+++ b/src/api/work/work.js
@@ -1,10 +1,10 @@
import request from '@/axios';
-import { baseUrl } from '@/config/env';
+
export const startList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/work/start-list',
+ url: '/blade-flow/work/start-list',
method: 'get',
params: {
...params,
@@ -16,7 +16,7 @@ export const startList = (current, size, params) => {
export const claimList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/work/claim-list',
+ url: '/blade-flow/work/claim-list',
method: 'get',
params: {
...params,
@@ -28,7 +28,7 @@ export const claimList = (current, size, params) => {
export const todoList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/work/todo-list',
+ url: '/blade-flow/work/todo-list',
method: 'get',
params: {
...params,
@@ -40,7 +40,7 @@ export const todoList = (current, size, params) => {
export const sendList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/work/send-list',
+ url: '/blade-flow/work/send-list',
method: 'get',
params: {
...params,
@@ -53,7 +53,7 @@ export const sendList = (current, size, params) => {
export const doneList = (current, size, params) => {
return request({
- url: baseUrl + '/blade-flow/work/done-list',
+ url: '/blade-flow/work/done-list',
method: 'get',
params: {
...params,
@@ -65,7 +65,7 @@ export const doneList = (current, size, params) => {
export const claimTask = (taskId) => {
return request({
- url: baseUrl + '/blade-flow/work/claim-task',
+ url: '/blade-flow/work/claim-task',
method: 'post',
params: {
taskId
@@ -76,7 +76,7 @@ export const claimTask = (taskId) => {
export const completeTask = (data) => {
return request({
- url: baseUrl + '/blade-flow/work/complete-task',
+ url: '/blade-flow/work/complete-task',
method: 'post',
data
})
diff --git a/src/axios.js b/src/axios.js
index 5470f16..aee691d 100755
--- a/src/axios.js
+++ b/src/axios.js
@@ -10,11 +10,13 @@ import store from '@/store/';
import router from '@/router/'
import { serialize } from 'utils/util'
import { getToken } from 'utils/auth'
+import { isURL } from 'utils/validate'
import { ElMessage } from 'element-plus'
import website from '@/config/website';
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
import { Base64 } from 'js-base64';
+import { baseUrl } from '@/config/env';
axios.defaults.timeout = 10000;
//返回其他状态吗
axios.defaults.validateStatus = function (status) {
@@ -31,6 +33,7 @@ axios.interceptors.request.use(config => {
NProgress.start() // start progress bar
const meta = (config.meta || {});
const isToken = meta.isToken === false;
+ if (!isURL(config.url)) config.url = baseUrl + config.url
config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
if (getToken() && !isToken) {
config.headers[website.tokenHeader] = 'bearer ' + getToken()
diff --git a/src/components/avue-ueditor/main.vue b/src/components/avue-ueditor/main.vue
index 81d8f5e..bcd5333 100644
--- a/src/components/avue-ueditor/main.vue
+++ b/src/components/avue-ueditor/main.vue
@@ -1,13 +1,11 @@
-
-
+
-
+
@@ -20,6 +18,12 @@ const emit = defineEmits();
const props = defineProps({
placeholder: String,
modelValue: String,
+ minRows: [String, Number]
+})
+const styleName = computed(() => {
+ return {
+ height: props.minRows * 50 + 'px'
+ }
})
// 编辑器实例,必须用 shallowRef
const editorRef = shallowRef()
@@ -52,4 +56,10 @@ const handleCreated = (editor) => {
\ No newline at end of file
diff --git a/src/mac/index.vue b/src/mac/index.vue
index 75a8ff4..70bd4a9 100644
--- a/src/mac/index.vue
+++ b/src/mac/index.vue
@@ -124,13 +124,14 @@ export default {
switchTheme () {
this.$store.commit('SET_THEME_NAME', '')
this.$router.push(this.tagWel);
- location.reload();
+ setTimeout(() => location.reload())
+
},
logout () {
this.$store.commit('SET_THEME_NAME', '')
this.$store.dispatch("LogOut").then(() => {
this.$router.push({ path: "/login" });
- location.reload();
+ setTimeout(() => location.reload())
});
},
startTimer () {
diff --git a/src/page/index/top/top-lang.vue b/src/page/index/top/top-lang.vue
index bc43967..528e049 100755
--- a/src/page/index/top/top-lang.vue
+++ b/src/page/index/top/top-lang.vue
@@ -8,8 +8,6 @@
command="zh-cn">中文
English
- 日文
diff --git a/src/page/index/top/top-theme.vue b/src/page/index/top/top-theme.vue
index 4e8bd49..d5ebfce 100755
--- a/src/page/index/top/top-theme.vue
+++ b/src/page/index/top/top-theme.vue
@@ -91,12 +91,13 @@ export default {
this.$store.commit("SET_THEME_NAME", val);
setTheme(val);
if (this.$store.getters.isMacOs) {
- location.reload();
+ this.$router.push(this.tagWel)
+ setTimeout(() => location.reload())
}
}
},
computed: {
- ...mapGetters(["themeName"])
+ ...mapGetters(["themeName", "tagWel"])
},
mounted () {
this.text = this.themeName;
diff --git a/src/permission.js b/src/permission.js
index 73ab2a0..a1a25ce 100755
--- a/src/permission.js
+++ b/src/permission.js
@@ -50,7 +50,7 @@ router.beforeEach((to, from, next) => {
router.afterEach(to => {
NProgress.done();
- let title = router.$avueRouter.generateTitle(to)
+ let title = router.$avueRouter.generateTitle(to, { label: 'name' })
router.$avueRouter.setTitle(title);
store.commit('SET_IS_SEARCH', false)
});
\ No newline at end of file
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index bf66a09..165f385 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -73,7 +73,7 @@