Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
This commit is contained in:
super_liu
2022-02-17 20:39:23 +08:00
38 changed files with 2602 additions and 128 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ const ssoLogout = 'http://sso.foton.com.cn/logout?service='
// 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'idm'
const webLoginType = 'dev'
// 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088'