From 2fcc2b06a3e49e8ccd48738a80b3f8c168288ae8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 23 Dec 2021 17:58:09 +0800 Subject: [PATCH 1/5] commit --- .../processCenter/pages/creatProcess/bzdy/step3.vue | 6 +++--- .../processCenter/pages/creatProcess/bzdy/step4.vue | 10 +++++----- src/pages/processCenter/pages/phone/bzdy/step4.vue | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index cf5830f9f..41c58074a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -470,9 +470,9 @@ this.form.modelList = data.modelList || data.form.modelList this.form.responUserList = data.form.responUserList this.form.responUserListName = data.form.responUserListName - this.form.fileName = data.form.fileName || data.fileName || '' - this.form.fileId = data.form.fileId || data.fileId || '' - this.form.dyhz = data.form.dyhz || data.dyhz || '' + this.form.fileName = data.form? data.form.fileName : '' + this.form.fileId = data.form ? data.form.fileId : '' + this.form.dyhz = data.form ? data.form.dyhz : '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 9ddf7ef07..e2f749862 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -374,14 +374,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.dyhz = data.dyhz || data.form.dyhz + this.form.dyhz = data.form ? data.form.dyhz : '' this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.file = data.fileId || data.form.fileId - this.form.fileName = data.fileName || data.form.fileName - this.form.fileId = data.fileId || data.form.fileId - this.form.modelList = data.modelList || data.form.modelList + this.form.file = data.form ? data.form.fileId : '' + this.form.fileName = data.form ? data.form.fileName : '' + this.form.fileId = data.form ? data.form.fileId : '' + this.form.modelList = data.form ? data.form.modelList : [] this.form.fjList = data.fjList || data.form.fjList }).catch(e => { }) diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index e3794e810..f8b76f847 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -315,14 +315,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.dyhz = data.dyhz || data.form.dyhz + this.form.dyhz = data.form ? data.form.dyhz : '' this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.file = data.fileId || data.form.fileId - this.form.fileName = data.fileName || data.form.fileName - this.form.fileId = data.fileId || data.form.fileId - this.form.modelList = data.modelList || data.form.modelList + this.form.file = data.form ? data.form.fileId : '' + this.form.fileName = data.form ? data.form.fileName : '' + this.form.fileId = data.form ? data.form.fileId : '' + this.form.modelList = data.form ? data.form.modelList : [] this.form.fjList = data.fjList || data.form.fjList }).catch(e => { }) From bcec7595226fbfb2b1316e848c9b5a045b6b63e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 23 Dec 2021 17:59:48 +0800 Subject: [PATCH 2/5] commit --- .../pages/creatProcess/xmpg2/step12.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 1474667c0..775f91db2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -478,19 +478,19 @@ export default { this.listForm.dataList.forEach(item => { if(item.workPeople !== ''){ this.dataList.push(item) - item.children.forEach(items=> { - if(items.key === item.standId){ - this.$set(items, "standName", item.standName); - this.$set(items, "standEnName", item.standEnName); - this.$set(items, "standYear", item.standYear); - this.$set(items, "standSort", item.standSort); - this.$set(items, "standNumber", item.standNumber); - this.$set(items, "zccssrq", item.zccssrq); - this.$set(items, "xcxssrq", item.xcxssrq); - this.$set(items, "ssrq", item.ssrq); - } - }) } + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + this.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); + } + }) }) this.listForm.dataList.forEach(item => { dataChildren.push(item.children) From a9b912f69b00b2857bb85957396b53d52777ee82 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 23 Dec 2021 21:44:15 +0800 Subject: [PATCH 3/5] feat: There is no way the,only --- src/common/preview/index.js | 7 +++++-- src/sysConfig/index.js | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/common/preview/index.js b/src/common/preview/index.js index 0edbbe501..f0982ca45 100644 --- a/src/common/preview/index.js +++ b/src/common/preview/index.js @@ -1,8 +1,9 @@ /** * 文件预览 */ -import { onlyOfficeUrl } from '@/sysConfig' +import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { getBusStandFileByAttId } from 'api/process' +let Base64 = require('js-base64').Base64; export default attId => { getBusStandFileByAttId({ attId @@ -15,7 +16,9 @@ export default attId => { window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) }else { const nowTime = new Date().getTime() - window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); + } } }).catch(e => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 8d821dfcb..b9934c40b 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -19,7 +19,10 @@ const devWebUrl = 'https://srms.foton.com.cn/#/' const webLoginType = 'dev' // 配置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' @@ -59,6 +62,7 @@ module.exports = { ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, + kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, serverUrl: 'https://' + serverIP, // 服务器IP地址 interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, From b5b9d29410bab72c44287e99ac8ae8c79ce9a35f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 23 Dec 2021 21:47:36 +0800 Subject: [PATCH 4/5] feat: There is no way the,only --- src/sysConfig/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index b9934c40b..1ba8b30d7 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -22,7 +22,7 @@ const webLoginType = 'dev' const onlyOfficeUrl = 'http://10.100.5.116:8088' // 配置 kkFileView 前端服务 -const kkFileViewUrl = 'https://srms.foton.com.cn/preview/' +const kkFileViewUrl = 'https://srms.foton.com.cn/preview' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -57,15 +57,15 @@ 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, 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 cfec86ba0c56b4fe4a69618ea9e256e013a0a650 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 09:35:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index edc19d107..26874117b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1267,7 +1267,6 @@ export default { }, // 编辑按钮 editTghisRow(row) { - console.log(row); // 用来储存取消时原来的数据，防止取消时修改 localStorage.setItem("obj", JSON.stringify(row)); @@ -1300,14 +1299,13 @@ export default { }, // 抽屉提交按钮 saveInfo() { - console.log(this.editRowData); - if (this.editRowData.ssrq !== '') { + if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) { this.editRowData.ssrq = this.editRowData.ssrq.join(',') } - if (this.editRowData.xcxssrqgj !== ''){ + if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null){ this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',') } - if (this.editRowData.zccssrqgj !== ''){ + if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null){ this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',') } this.drawerEdit = false @@ -2127,8 +2125,6 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - console.log('能源类型',res.data.NYLXCLASS); - console.log('适用车型',res.data.ENERGYTYPES); this.allSelectOptions = res.data || {} this.regionOptions = res.data.REGION // 基础信息 区域list this.applyArcticOptions = res.data.NYLXCLASS // 能源类型