diff --git a/src/common/axios/index.js b/src/common/axios/index.js index a2f783880..82c0c5fe3 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -32,7 +32,7 @@ let formData = (data) => { } return _formData } -_axios.defaults.timeout = 60000 +_axios.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 _axios.defaults.headers['Content-type'] = 'application/json' window._axiosPromiseArr = [] /** diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 28cd8f6c4..c83de9a6e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1632,9 +1632,9 @@ export default { issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change' } ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 26b4eaee7..940f7b8fd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -193,8 +193,14 @@ + + + + + + { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 8a845e5d3..5c8b23cf5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -209,8 +209,14 @@ + + + + + + { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index a3249cfc8..f352aa371 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -207,8 +207,14 @@ - + + + + + + - + + + + + + { if (valid) { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 62b44c7ad..4b5e53eb3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -5,26 +5,26 @@ */ // 服务器地址 // const devIp = '39.98.140.126' -// const devInterfacePORT = '4202' -// const devIp = '192.168.1.42' -// const devInterfacePORT = '9999' -// const devIp = '10.10.10.46' -// const devInterfacePORT = '4202' -// const devIp = '10.0.3.10' -const devIp = 'localhost' -const devInterfacePORT = '10086' +// const devInterfacePORT = '10005' +// const devIp = '192.168.10.6' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' +const devIp = '10.19.11.243' +const devInterfacePORT = '4304' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' + +const ssoLogout = 'http://sso.foton.com.cn/logout?service=' // 配置 前端服务 -const devWebUrl = 'http://62.234.136.153:8038/#/' +const devWebUrl = 'https://srms.foton.com.cn/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'dev' +const webLoginType = 'idm' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://127.0.0.1:8080' -// const onlyOfficeUrl = 'http://10.10.10.46:8103' +const onlyOfficeUrl = 'http://10.100.5.116:8088' + +// 配置 kkFileView 前端服务 +const kkFileViewUrl = 'https://srms.foton.com.cn/preview' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -48,12 +48,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -// const prodIp = '39.98.140.126' -// const prodInterfacePORT = '4201' -const prodIp = '10.10.10.46' -const prodInterfacePORT = '4202' -// const prodIp = 'slrs.foton.com.cn' -// const prodInterfacePORT = '' +// const prodIp = '62.234.136.153' +// const prodInterfacePORT = '8033' +const prodIp = 'srms.foton.com.cn' +const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -61,14 +59,16 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT module.exports = { - baseUrl: 'http://' + serverIP + ':' + interfacePORT, + baseUrl: 'https://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, + ssoLogoutUrlDev: ssoLogout + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, + kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, - serverUrl: 'http://' + serverIP, // 服务器IP地址 - interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'https://' + serverIP, // 服务器IP地址 + interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址