geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

Browse Source
This commit is contained in:
‘huanghaiixia’
2026-02-10 15:09:34 +08:00
parent 72d3ccbc6d e9926d7783
commit 792e7758cc
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = /
# 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
# 可以有多个，注意多个不能换行，否则代理将会失效 # 可以有多个，注意多个不能换行，否则代理将会失效
#VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
VITE_PROXY=[["/api/magic-api/", "http://127.0.0.1:8097","/magic-api/"], ["/api","http://10.10.2.102:9500"]] VITE_PROXY=[["/api/workflow","http://10.0.0.2:8093/workflow/"],["/api/magic-api","http://10.0.0.2:8097/magic-api/"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]]

2
src/utils/storage.ts
View File

@ -65,7 +65,7 @@ class StorageData {
static fromJSON(json: string): StorageData { static fromJSON(json: string): StorageData {
const data = JSON.parse(json); const data = JSON.parse(json);
return new StorageData(data.data,data.type,parseInt(data.timeout)); return new StorageData(data.data,data.type,data.timeout);
} }
} }

18
src/views/workflow/design/bpmn/config/propertyConfig.ts
View File

@ -240,15 +240,15 @@ const UserProperties = {
buttonGroup: '', buttonGroup: '',
index: 6 index: 6
}, },
// { {
// buttonType: ButtonType.DEFAULT, //按钮类型 buttonType: ButtonType.DEFAULT, //按钮类型
// buttonName: t('结束'), //按钮名称 buttonName: t('结束'), //按钮名称
// buttonCode: ApproveCode.FINISH, //按钮编码 buttonCode: ApproveCode.FINISH, //按钮编码
// approveType: ApproveType.FINISH, // approveType: ApproveType.FINISH, //
// checked: true, //选中 checked: true, //选中
// buttonGroup: '更多', buttonGroup: '更多',
// index: 7 index: 7
// }, },
{ {
buttonType: ButtonType.DEFAULT, //按钮类型 buttonType: ButtonType.DEFAULT, //按钮类型
buttonName: t('查看流程图'), //按钮名称 buttonName: t('查看流程图'), //按钮名称