From 8c7ba977260820c1a41c40fc22e9c9b3e0aa68e5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 15 Dec 2022 15:45:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?10=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 4b5e53eb3..69e2c1375 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -5,26 +5,26 @@ */ // 服务器地址 // const devIp = '39.98.140.126' -// const devInterfacePORT = '10005' -// const devIp = '192.168.10.6' +// 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.11' +// const devIp = 'localhost' +// const devInterfacePORT = '10086' // 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 = 'https://srms.foton.com.cn/#/' +const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'idm' +const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://10.100.5.116:8088' - -// 配置 kkFileView 前端服务 -const kkFileViewUrl = 'https://srms.foton.com.cn/preview' +// const onlyOfficeUrl = 'http://127.0.0.1:8080' +const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -48,10 +48,12 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -// const prodIp = '62.234.136.153' -// const prodInterfacePORT = '8033' -const prodIp = 'srms.foton.com.cn' -const prodInterfacePORT = '' +// 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 serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -59,16 +61,14 @@ 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: 'https://' + serverIP + ':' + interfacePORT, + baseUrl: 'http://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, - ssoLogoutUrlDev: ssoLogout + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, - kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, - serverUrl: 'https://' + serverIP, // 服务器IP地址 - interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'http://' + serverIP, // 服务器IP地址 + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 @@ -78,4 +78,4 @@ module.exports = { enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` -} +} \ No newline at end of file From 969a22827f528cbe4b0c0b8eee80db071638598e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 15 Dec 2022 17:18:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?10=E7=8E=AF=E5=A2=83onlyoffice=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 69e2c1375..1467ca0b7 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -24,7 +24,7 @@ const webLoginType = 'dev' // 配置onlyOffice 前端服务 // const onlyOfficeUrl = 'http://127.0.0.1:8080' -const onlyOfficeUrl = 'http://10.10.10.46:8103' +const onlyOfficeUrl = 'http://10.10.10.46:8889' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 11f56e8cdb9d7c51a3f91109779d174782511933 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 23 Dec 2022 17:09:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?299-=E5=8F=91=E5=B8=83=E7=A8=BF=E8=AF=91?= =?UTF-8?q?=E6=96=87=E9=99=84=E4=BB=B6=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 5afcf5de7..8cf108884 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2161,7 +2161,10 @@ export default { child6Func(child6) { const list = [] if (child6 && child6.length > 1) { - list.push(child6[0]) + for(let i = 0 ; i < child6.length ; i++){ + list.push(child6[i]) + } + // list.push(child6[0]) return list } return child6 From 4f347270157e9f8e9d098ae59c19b421b8e2d54c Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 26 Dec 2022 11:29:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?300-=E5=8F=91=E5=B8=83=E7=A8=BF=E5=8E=9F?= =?UTF-8?q?=E6=96=87=E3=80=81=E8=AF=91=E6=96=87=E3=80=81=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=9C=AC=E3=80=81=E5=8B=98=E8=AF=AF=E4=BB=B6=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E8=A1=A5=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=95=B0=E6=94=B9=E4=B8=BA20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 ++ .../components/EnterpriseStandardDatabase.vue | 2 ++ .../foreignStandardsAndRegulations/index.vue | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index f1f5dc88c..4f2ea4784 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -756,6 +756,7 @@ :disabled="formdisableflag" :show-modify-name="true" @fileSuccess="fileSuccess" + :limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8" > @@ -1207,6 +1209,7 @@ v-model="sarStandardsInfoEO[field.attrField]" :disabled="formdisableflag" @fileSuccess="fileSuccess" + :limit="['XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8" >