From fb6afac02b2e1a4d0ee7aab884a61a59a374be53 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 15:42:12 +0800 Subject: [PATCH 01/34] feat:new --- src/sysConfig/index.js | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index a6096515a..4b5e53eb3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,21 +6,25 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.1.42' -// const devInterfacePORT = '9999' -const devIp = '39.98.140.126' -const devInterfacePORT = '4201' +// 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.100.5.116:8088' + +// 配置 kkFileView 前端服务 +const kkFileViewUrl = 'https://srms.foton.com.cn/preview' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -44,10 +48,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '39.98.140.126' -const prodInterfacePORT = '4201' -// 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 @@ -55,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, // 多文件上传地址 From 4ab51b026f14229cf2ca6083697d8febdc42e87e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 13 Apr 2022 19:37:29 +0800 Subject: [PATCH 02/34] feat:new --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index ab42df17f..3dcf1a0ed 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ 标准法规管理系统 - + From 73b311bd6b6c2e43e1bd7c3334145a1a9e9c6979 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Fri, 26 Aug 2022 12:47:26 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/domesticDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index 3c91b2cd2..87d499bd4 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -5,7 +5,7 @@
{{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber - }} 《{{ sarStandardsInfoEO.standName }}》 + }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》 {{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》 From 8d89f6f5f9642b1583f5667c1ffbf5327adedc80 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Wed, 31 Aug 2022 13:21:45 +0800 Subject: [PATCH 04/34] 56789 --- src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index b9103c71d..fba5336db 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -404,7 +404,7 @@ @change="isRelateAccessChange" :popper-append-to-body="false" placeholder="是否纳入认证清单"> - + From da9ea875113b5cb32b568f46420d2c61a71717d0 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Wed, 31 Aug 2022 14:37:27 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=89=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 4d20d5bcf..882a506c5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -190,7 +190,7 @@ -

标准法规工程师

+

发起人

-

标准法规工程师

+

发起人

-

标准法规部法规分析业务经理

+

责任部门高级经理

Date: Thu, 1 Sep 2022 09:43:01 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=89=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 882a506c5..1a03b342d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -193,7 +193,8 @@

发起人

-
@@ -220,7 +221,7 @@

发起人

-
@@ -233,8 +234,8 @@

责任部门高级经理

- +
@@ -735,6 +736,7 @@ export default { pageNo: 1, pageSizeNo: this.$store.getters.userInfo.configContent }, + username: this.$store.state.laws_urm || '', // 用户名 standList: [], //新添加的标准 commentText: '', modalshowflag: false, // drawer开关 @@ -754,7 +756,8 @@ export default { directorUser: "", dockUserName: "", ministerUserName: this.$store.getters.userInfo.userName, - directorUserName: "" + directorUserName: "", + startUserName: this.$store.getters.userInfo.userName }, formRules: { listType: [ From d39158f7bd86a58b73b83872f9afcc341afcb9b5 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 1 Sep 2022 16:09:36 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 3e4997e2b..64bfc9447 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -433,6 +433,7 @@ loading2: false, itemType: false, interpretationTime: '', + prcNum: '', riskDegreeModal: false, editData: {}, riskDegree: '', @@ -619,6 +620,7 @@ }, // 外层清空条件查询 handleProjectCompliance (row) { this.standId = row.standId + this.prcNum = row.prcNum this.interpretationTime = row.interpretationTime this.querySarProStateZero() }, @@ -633,7 +635,8 @@ form.standId = this.standId form.current = this.sarProStateTotalPage form.size = this.sarProStatePageSize - form.interpretationTime = this.interpretationTime + // form.interpretationTime = this.interpretationTime + form.prcNum = this.prcNum this.$http.get('sarStandardComplianceAssessResult/interpretation', form, { _this: this, loading: 'loading2' From 1f9301f33b127ff7a22bcf6e0d9e0c23cb3cd2a4 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 6 Sep 2022 09:43:43 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E6=B3=A8=E6=8E=89=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabComponents/newProcess/index.vue | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 1cfb9de01..5eaf0d376 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -79,21 +79,21 @@
-
- -
-
-
- -
-
-
政策征求意见流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -124,21 +124,21 @@
-
- -
-
-
- -
-
-
重点认证标准/政策合规性项目审查流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -154,21 +154,21 @@
-
- -
-
-
- -
-
-
政策入库流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -284,36 +284,36 @@

标准化活动相关流程
-
- -
-
-
- -
-
-
政策课题入会流程
-
-
-
-
- -
-
- -
-
-
- -
-
-
政策课题参会流程
-
-
-
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From 7fd72c2d3179fa7d67dd39d0ad396d0210f3d828 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 8 Sep 2022 17:00:39 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=88=86=E8=A7=A3=E5=8D=95=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=B8=A6=E5=87=BA=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 76 ++++++++++++------- .../pages/details.vue | 2 +- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index cc3542e38..3e1aac1f8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -554,7 +554,31 @@ export default { standNumber: "" }, taskIds: this.$route.query.taskIds, - decomposeOptions: [], //分解单数据 + decomposeOptions: [{ + value: "CA", + label: "草稿", + item: "CA" + }, + { + value: "ZQYJG", + label: "征求意见稿", + item: "ZQYJG" + }, + { + value: "BPG", + label: "报批稿", + item: "BPG" + }, + { + value: "SSG", + label: "送审稿", + item: "SSG" + }, + { + value: "FBGBJBD", + label: "发布稿（必读）", + item: "FBGBJBD" + }], //分解单数据 standardTypeOptions: [ { value: "INLAND", @@ -728,11 +752,11 @@ export default { this.roleForm.ministerUserName = item.form.ministerUserName this.submitFlag = '修改节点' this.dataList.distributePerson = this.listForm.dataList[0].distributePerson - this.$http.get("SarStandItems/sar-stand-items/getFileType", { - standId: item.standId - }, {}, res => { - this.decomposeOptions = res.data; - }); + // this.$http.get("SarStandItems/sar-stand-items/getFileType", { + // standId: item.standId + // }, {}, res => { + // this.decomposeOptions = res.data; + // }); }else{ this.hisListForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item)) @@ -751,11 +775,11 @@ export default { this.qualityEngineer = item.qualityEngineer this.submitFlag = '修改节点' this.dataList.distributePerson = this.listForm.dataList[0].distributePerson - this.$http.get("SarStandItems/sar-stand-items/getFileType", { - standId: item.standId - }, {}, res => { - this.decomposeOptions = res.data; - }); + // this.$http.get("SarStandItems/sar-stand-items/getFileType", { + // standId: item.standId + // }, {}, res => { + // this.decomposeOptions = res.data; + // }); } }) }, @@ -1110,11 +1134,11 @@ export default { this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj; this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj; this.listForm.id = this.selectedList[0].id; - this.$http.get("SarStandItems/sar-stand-items/getFileType", { - standId: this.selectedList[0].id - }, {}, res => { - this.decomposeOptions = res.data; - }); + // this.$http.get("SarStandItems/sar-stand-items/getFileType", { + // standId: this.selectedList[0].id + // }, {}, res => { + // this.decomposeOptions = res.data; + // }); this.ListModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("您只能选择一条数据进行带入"); @@ -1254,21 +1278,21 @@ export default { this.dataList = mes.form.dataList; this.roleForm = mes.roleForm this.commentText = mes.commentText - this.$http.get("SarStandItems/sar-stand-items/getFileType", { - standId: mes.form.standId - }, {}, res => { - this.decomposeOptions = res.data; - }); + // this.$http.get("SarStandItems/sar-stand-items/getFileType", { + // standId: mes.form.standId + // }, {}, res => { + // this.decomposeOptions = res.data; + // }); }else{ this.listForm = mes.json.form; this.dataList = mes.json.form.dataList this.roleForm = mes.json.roleForm; this.commentText = mes.json.commentText; - this.$http.get("SarStandItems/sar-stand-items/getFileType", { - standId: mes.json.form.standId - }, {}, res => { - this.decomposeOptions = res.data; - }); + // this.$http.get("SarStandItems/sar-stand-items/getFileType", { + // standId: mes.json.form.standId + // }, {}, res => { + // this.decomposeOptions = res.data; + // }); } }); }, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 30aff555b..29b43fe7a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -144,7 +144,7 @@
符合
不符合
-
不涉及
+
不涉及
From 28ac8864b0c1dd207b461587c81de71a92671720 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 8 Sep 2022 18:57:41 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index e6c2483d2..4d2d69bc2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -897,6 +897,7 @@ export default { this.comFlag = 0; } else { this.listForm.dataList.forEach(item => { + // item.userId = this.$store.getters.userInfo.userId if (item.workPeople === "请选择责任人") { item.workPeople = ""; } From c77d40d5084826377487b4b11de55dd878669a01 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Fri, 9 Sep 2022 16:43:14 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E7=8E=B0null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 45ddb69bb..47db002e0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1769,10 +1769,19 @@ export default { // } this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { + // if (null == item.standSortShow){ + // item.standSortShow = ''; + // } if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber + if (null != item.standSortShow) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + if (null != item.standSortShow) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + }else{ + item.standNumber = item.standNumber + '-' + item.standYear + } } item.zrbm = item.attrInfoCaseMap.zrbm item.sycpx = item.attrInfoCaseMap.sycpx From 78faa6dfd51225de1b81da31265b74eed2455db9 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 09:58:43 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=EF=BC=8C=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E9=83=BD=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formList.vue | 24 +++++++-------- .../processCenter/pages/phone/bzrk/step2.vue | 8 ++--- .../pages/phone/qbfs/common/formListStep5.vue | 12 ++++---- .../pages/phone/qbrk/common/formList.vue | 24 +++++++-------- .../pages/phone/qbrk/common/formListIn.vue | 24 +++++++-------- .../searchCenter/pages/advancedSearch.vue | 30 +++++++++---------- .../pages/advancedSearchExternal.vue | 30 +++++++++---------- 7 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 56fa827a2..a160f0d0b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -183,12 +183,12 @@ - - - - - - + + + + + + @@ -223,12 +223,12 @@ - - - - - - + + + + + +
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 381705e7b..962d64951 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -288,10 +288,10 @@ - - - - + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue index 69afbdd4c..be7f8f1b5 100644 --- a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue @@ -141,12 +141,12 @@ - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue index b7ab40668..545b82a75 100644 --- a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue @@ -194,12 +194,12 @@ - - - - - - + + + + + + @@ -234,12 +234,12 @@ - - - - - - + + + + + +
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 91b7df1ee..2523504ac 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -341,11 +341,11 @@ > - - - - - + + + + + @@ -864,16 +864,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/pages/searchCenter/pages/advancedSearchExternal.vue b/src/pages/searchCenter/pages/advancedSearchExternal.vue index 2dd3275ef..c0363e8a0 100644 --- a/src/pages/searchCenter/pages/advancedSearchExternal.vue +++ b/src/pages/searchCenter/pages/advancedSearchExternal.vue @@ -341,11 +341,11 @@ > - - - - - + + + + + @@ -864,16 +864,16 @@ - - - - - - - - - - + + + + + + + + + + From 03aa52b43a45251bc1397d7e65a41f5c1c77c1da Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 11:01:58 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 4b5e53eb3..b59cd0f19 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,25 +6,21 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.6' +// const devIp = '192.168.1.42' +// const devInterfacePORT = '9999' +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 DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -48,10 +44,10 @@ 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 = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -59,16 +55,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, // 多文件上传地址 From 64702e2e572b8c763b363d6f6fd78b373c135723 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Tue, 27 Sep 2022 11:32:39 +0800 Subject: [PATCH 14/34] =?UTF-8?q?fix:=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E4=B8=AD=E7=9A=84=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=94=B9=E4=B8=BA=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 9 ++++++++- src/pages/details/otherStandardExternalDetails/index.vue | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 5b5806656..e76ece474 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -960,7 +960,7 @@ size="800px" :wrapperClosable="false" > - + - + Date: Tue, 27 Sep 2022 15:31:34 +0800 Subject: [PATCH 15/34] =?UTF-8?q?fix:=20=E5=B0=86=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=AF=E8=A2=AB=E4=BB=A3=E6=9B=BF=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standardRecognition/index.vue | 28 ++++++------- .../personal/pages/my-questions/index.vue | 28 ++++++------- src/pages/phone/domesticStand.vue | 8 ++-- .../pages/creatProcess/xmqdqr/step1-4.vue | 28 ++++++------- .../pages/creatProcess/xmqdqr/step1.vue | 28 ++++++------- .../pages/creatProcess/xmqdqr/step2.vue | 28 ++++++------- .../pages/creatProcess/xmqdqr/step3.vue | 28 ++++++------- .../pages/creatProcess/xmqdqr/step4.vue | 28 ++++++------- .../page/listTracking.vue | 30 +++++++------- .../domesticStandardsAndRegulations/index.vue | 36 ++++++++--------- .../foreignStandardsAndRegulations/index.vue | 40 +++++++++---------- .../regulatoryRepository/standQA/index.vue | 28 ++++++------- .../regulatoryRepository/standQA/index2.vue | 28 ++++++------- .../searchCenter/pages/advancedSearch.vue | 4 +- .../pages/advancedSearchExternal.vue | 4 +- .../searchCenter/pages/standardSearch.vue | 4 +- 16 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index e83ac8d4e..38070fb87 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -311,7 +311,7 @@ width="150" >