From 28a026b4a4c74071d3c5f95d9c720c3f3653731d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 14:04:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/transferList.vue | 8 ++++---- .../components/transferListvirtal.vue | 17 ++++++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b07dc98e7..17314e220 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,7 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', + uploadedfilelarger:'The uploaded file is larger than 50 MB', + marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 37ca1e33e..d0446cff7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1842,4 +1842,6 @@ module.exports = { designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', uploadedfilelarger:'文件大于', + uploadedfilelarger:'文件大于50M', + marketCertificationList:'市场认证清单', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index f1fda8f8b..548f3c44d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), dataIndex: 'name', align: 'left', ellipsis: true, diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue index c26d49d02..8a661ce0e 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -242,7 +242,22 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result && res.result.length > 0) { + let detailedWarningList = [] + res.result.forEach(val => { + detailedWarningList.push( + < div > { val } < /div>) + }) + this.$warning({ + content: ( + < div > + { detailedWarningList } + < /div> + ) + }) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('transferListFormHomo') From 77e594bae44dfde4b4c846ca49f129b48d4487f1 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 14:10:27 +0800 Subject: [PATCH 02/12] =?UTF-8?q?67211=20=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=82=AC=E5=8A=9E=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 34bc2d6d0..01db4e5b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9741,7 +9741,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 14:13:18 +0800 Subject: [PATCH 03/12] =?UTF-8?q?67222=20=E9=A1=B9=E7=9B=AE=E5=BA=93-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=20=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 079c40133..ea739fe22 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -434,3 +434,6 @@ ALTER TABLE `project_related_personnel` ALTER TABLE `project_task_planning` ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`; +-- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境 +ALTER TABLE `project_certification_directory` + MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; \ No newline at end of file From e7e328fb8f293788c5ca3c66390ee08c6921623f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:20:29 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 0c407627d..e4b0bf2b9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -162,7 +162,7 @@
- + {{ $t('processReset') }}
From 6e904708a934a7bd67420f817f611d2e56003aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:23:33 +0800 Subject: [PATCH 05/12] =?UTF-8?q?OTA=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d0446cff7..96ae8a37e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -604,7 +604,7 @@ module.exports = { StandardBreakdown: '标准分解单', searchInResults: '结果中检索', searchContent: '搜索内容', - viewFile: '查看文件', + viewFile: '查看已上传文件', fileFormatIncorrect: '文件格式不正确', pleaseUploadFile: '请上传文件', documentSplitList: '文档拆分列表展示', From ca8f9cde04735187f88c8a3e67faa8da2db47047 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:27:30 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=AF=E5=88=A0=EF=BC=8C=E5=9B=9E=E6=98=BE=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e2dbcf92d..27d90dfd9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -156,7 +156,7 @@ {{$t('Vehicledynamictype')}} - + @@ -165,7 +165,7 @@ - + @@ -326,6 +326,7 @@ import { message } from 'ant-design-vue' this.form.cpxh=res.result.cpxh this.form.txzd=res.result.txzd this.form.txzd=res.result.txzd + this.form.cdotasj=res.result.cdotasj this.form.id=res.result.id if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh @@ -338,8 +339,14 @@ import { message } from 'ant-design-vue' if(res.result.dllx2 == null){ res.result.dllx2 = undefined } + + if(res.result.cplb == null){ + res.result.cplb = undefined + } this.form.dllx1=res.result.dllx1 this.form.dllx2=res.result.dllx2 + this.form.cplb=res.result.cplb + this.getDllx2() // this.changeSelect() this.$forceUpdate() } @@ -366,6 +373,7 @@ import { message } from 'ant-design-vue' if(otaId==null || otaId == undefined){ otaId='' } + postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) @@ -387,6 +395,24 @@ import { message } from 'ant-design-vue' }else{ this. projectNameList2=['其他'] } + }, + getDllx2(){ + if(this.form.dllx1==undefined){ + this.projectNameList=[] + } + if(this.form.dllx1=='传统动力汽车'){ + this. projectNameList2=['汽油','柴油'] + } + if(this.form.dllx1=='节能汽车'){ + this. projectNameList2=['混合动力','天然气','甲醇','其他'] + } + if(this.form.dllx1=='新能源汽车'){ + this. projectNameList2=['纯电动','插电式混合动力','燃料电池'] + } + if(this.form.dllx1=='其他'){ + this. projectNameList2=['其他'] + } + }, update(){ From c172464493669cf1be4bfeed095e5a7b8c6d3ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:30:51 +0800 Subject: [PATCH 07/12] =?UTF-8?q?OTA=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/safetyPrecautions.vue | 4 ++-- .../vehicleinformation/components/upgradeRequirements.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 54953b5d8..d57a5aa42 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -253,7 +253,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ @@ -284,7 +284,7 @@ import ImportFile from '@/components/ImportFileData/index' } button{ - width: 89px; + //width: 89px; border-radius: 4px; cursor: pointer; background: #00B3BE; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 70cdeba6a..42d0199c9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -299,7 +299,7 @@ export default { this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last() { @@ -323,7 +323,7 @@ export default { } button { - width: 89px; + /*width: 89px;*/ border-radius: 4px; cursor: pointer; background: #00B3BE; From add30a9e686d86c7c386899c4859c36227ce5fd4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:47:19 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradeimpactassessment.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5d06e9870..6bc25cb36 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -170,6 +170,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage' import ImportFile from '@/components/ImportFileData/index' import uploadFile from '@/components/uploadFile/file' +import { result } from 'lodash' export default { name: 'beupgradedonline', @@ -375,6 +376,9 @@ this.$forceUpdate() } getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code==200){ + if(res.result.zxsj==0){ + res.result.zxsj=null + } this.form=res.result==null ? { sjmd:'', // fhgd:1, @@ -395,6 +399,9 @@ this.$forceUpdate() otaId='' } this.form.otaId=otaId + if(this.form.zxsj==undefined){ + this.form.zxsj=0 + } postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) From 0574c903e094469080620fdd20949a694b286eb2 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:54:47 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 6a806d92a..54ccc17db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -316,8 +316,8 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 - this.form.dllx2=res.result.dllx2 + this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 this.$forceUpdate() }) } From 3b086554f0905186c579c379342f16b4b65ef229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 14:58:51 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaBaSjListServiceImpl.java | 5 +++-- .../service/impl/OtaBaSjSjmbcxServiceImpl.java | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 6bb47d691..f28c2da4c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -187,11 +187,12 @@ public class OtaBaSjListServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 15:02:49 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index d5b38ab0f..7022f50c4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -866,9 +866,9 @@ export default { downloadFile('ota/otaBaCxList/exportTemplate', '驾驶辅助系统基础备案参数' + '.zip', {}) }, getData(){ - if(this.$route.query.type == 1){ - return - } + // if(this.$route.query.type == 1){ + // return + // } let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' From 59a0f7649ed83585b2869c3811a45f7655cefcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 15:09:04 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/managementdetails/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 2b8cea82a..f6fa244d4 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -344,7 +344,8 @@ let configDataList = [] for (let i = 0; i < selectedRowKeysValue.length; i++) { configDataList.push({ - id: selectedRowKeysValue[i].id + id: selectedRowKeysValue[i].id, + remarks:selectedRowKeysValue[i].remarks }) if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) {