Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -60,7 +60,7 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&
|
|||||||
const devWebUrl = 'https://srms.foton.com.cn/#/'
|
const devWebUrl = 'https://srms.foton.com.cn/#/'
|
||||||
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
|
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
|
||||||
const webLoginType = 'dev'
|
const webLoginType = 'dev'
|
||||||
|
|
||||||
|
// 配置onlyOffice 前端服务
|
||||||
|
const onlyOfficeUrl = 'http://127.0.0.1:8080'
|
||||||
|
|
||||||
// 云端端口号
|
// 云端端口号
|
||||||
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
|
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
|
||||||
const simpleFilePath = 'att/attFile/upload'
|
const simpleFilePath = 'att/attFile/upload'
|
||||||
@@ -54,6 +58,7 @@ module.exports = {
|
|||||||
webLoginType: webLoginType,
|
webLoginType: webLoginType,
|
||||||
ssoLoginUrlDev: ssoLogin + devWebUrl,
|
ssoLoginUrlDev: ssoLogin + devWebUrl,
|
||||||
ssoLoginUrl: ssoLogin,
|
ssoLoginUrl: ssoLogin,
|
||||||
|
onlyOfficeUrl: onlyOfficeUrl,
|
||||||
devWebUrl: devWebUrl,
|
devWebUrl: devWebUrl,
|
||||||
serverUrl: 'https://' + serverIP, // 服务器IP地址
|
serverUrl: 'https://' + serverIP, // 服务器IP地址
|
||||||
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
|
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
|
||||||
|
|||||||
Reference in New Issue
Block a user