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

Merge remote-tracking branch 'remotes/origin/dev' into dev-sugx20250509

Browse Source 
# Conflicts:
#	.env.development
#	.env.production
#	src/utils/env.ts
#	src/views/secondDev/LoginForm.vue
This commit is contained in:
suguangxu
2025-06-06 15:20:51 +08:00
parent 090457b5e7 792b78df1d
commit 1f7e0e6763
38 changed files with 683 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.env.development
View File

@ -17,7 +17,9 @@ VITE_DROP_CONSOLE = false
# 接口地址
# 如果没有跨域问题，直接在这里配置即可
VITE_GLOB_API_URL=http://10.133.96.105:8077
VITE_GLOB_API_URL=http://10.133.96.137:8090
# VITE_GLOB_API_URL=http://10.4.126.67:30000
# VITE_GLOB_API_URL=http://10.0.252.25:8090
#VITE_GLOB_REQUEST_TIMEOUT=20000
# 报表系统地址
VITE_GLOB_REPORT_URL=http://10.133.96.105:3100
@ -38,11 +40,11 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300
VITE_GLOB_API_URL_PREFIX =
#租户开关
# VITE_TENANT_ENABLED = true
# VITE_GLOB_TENANT_ENABLED = true
#是否需要输入租户
# VITE_TENANT_INPUT_REQUIRED = true
# VITE_GLOB_TENANT_INPUT_REQUIRED = true
# 屏蔽通知消息的轮询
VITE_DISABLE_NEWS=false
VITE_GLOB_DISABLE_NEWS=false
# 禁用关闭页面提示
# VITE_CLOSE_ALERT_DISABLED=true
# VITE_GLOB_CLOSE_ALERT_DISABLED=true