From 001cdafc3d95267137e75617fa49e8a33cd3c485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 29 Mar 2023 11:07:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8E=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E7=AC=A6=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++++ jero-web/src/common/lang/zh-cn.js | 4 ++++ .../projectRegulationTasks/index.vue | 18 +++++++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8a2f611e0..6307e5a29 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1734,5 +1734,9 @@ module.exports = { gnxtwh:'Functional system maintenance', gnxt:'Functional system', dykzq:'Corresponding controller', + releaseRegulatoryList:'Release of regulatory list', + preHomoFlow:'Pre-Homo flow', + verifyConformanceConfirmation:'Verify conformance confirmation', + designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', } \ 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 c50b848cf..52bc1eeed 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1836,5 +1836,9 @@ module.exports = { gnxtwh:'功能系统维护', gnxt:'功能系统', dykzq:'对应控制器', + releaseRegulatoryList:'法规清单发布', + preHomoFlow:'Pre-Homo流程', + verifyConformanceConfirmation:'验证符合性确认', + designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 6e94a9c68..6b7901469 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -124,24 +124,24 @@ }, toggleSearchStatus: false, taskTypeList: [ + // { + // name: this.$t('confirmationOfRegulationsList'), + // value: '10' + // }, { - name: this.$t('confirmationOfRegulationsList'), + name: this.$t('releaseRegulatoryList'), value: '10' }, { - name: this.$t('listTaskConfirmation'), - value: '1' - }, - { - name: this.$t('designComplianceReview'), + name: this.$t('designConformanceVerification'), value: '2' }, { - name: this.$t('preHomeConfirmation'), - value: '3' + name: this.$t('preHomoFlow'), + value: '21' }, { - name: this.$t('verificationComplianceReview'), + name: this.$t('verifyConformanceConfirmation'), value: '4' } ], From a176d22a2c3070c98d75dc000e9ad67a772bea5d Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 11:12:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?67137=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=82=AC=E5=8A=9E=E9=97=AE=E9=A2=98=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 --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 076fee61b..9266877f8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2301,7 +2301,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList); - queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId()); +// queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId()); List projectCertificationInventoryEOList = this.list(queryWrapper); if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ From 69a22784f17303ed2962f68eabc025b10fdc36ed Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 11:31:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?67517=20=E5=A6=82=E6=9E=9C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=A0=E9=99=A4=E4=BA=86=EF=BC=8C=E5=9C=A8=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E4=B8=8D=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index d3d4486ae..3119767fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -19,6 +19,7 @@ + and project_name is not null and ( temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%') From dcddac36a909fc4f9bb377d58edef9f93168177e Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 11:32:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otamanagement/upgradeactivity/index.vue | 5 +++-- .../components/auxiliaryupgradehavechanged.vue | 18 ++++++++++++++---- .../components/upgradehavechanged.vue | 12 ++++++++++-- .../components/usernotification.vue | 10 ++++++++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 6018ef0da..9fcf1bc8a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -201,7 +201,8 @@ export default { //url传参严格按照当前命名 url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page', - deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch' + deleteBatch: '/ota/otaBaSjList/delete' + }, visible: false, loading: false, @@ -388,7 +389,7 @@ export default { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { + deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 7ba9967a4..68c4443a4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -32,7 +32,7 @@ - + @@ -87,7 +87,9 @@ export default { return { dataSource: [ { - + sjqbgcs:'不涉及', + sjhbgcs:'不涉及', + sjsjkzq:'ADC ADAS主控制器' } ], fileList:'', @@ -219,7 +221,11 @@ export default { otaId='' } getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ - this.dataSource =res.result.list == null ? [{}] : res.result.list + this.dataSource =res.result.list == null ? [ { + sjqbgcs:'不涉及', + sjhbgcs:'不涉及', + sjsjkzq:'ADC ADAS主控制器' + }] : res.result.list this.fileList = res.result.fj }) }, @@ -276,7 +282,11 @@ export default { this.$emit('beupgradedonlinedown') }, addlineAtBot(){ - let obj={} + let obj= { + sjqbgcs:'不涉及', + sjhbgcs:'不涉及', + sjsjkzq:'ADC ADAS主控制器' + } this.dataSource.push(obj) }, deleteData(record){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 7359cc864..c18dd9d0d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -90,6 +90,8 @@ export default { return { dataSource: [ { + sjqbgcs:'不涉及', + sjhbgcs:'不涉及' } ], loading: false, @@ -285,7 +287,10 @@ export default { otaId='' } getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ - this.dataSource =res.result.list == null ? [{}] : res.result.list + this.dataSource =res.result.list == null ? [ { + sjqbgcs:'不涉及', + sjhbgcs:'不涉及' + }] : res.result.list }) }, save(){ @@ -317,7 +322,10 @@ export default { this.$emit('upgradedonlinedown') }, addlineAtBot(){ - let obj={} + let obj= { + sjqbgcs:'不涉及', + sjhbgcs:'不涉及' + } this.dataSource.push(obj) }, deleteData(record){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index d4f042877..10413d2a0 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -203,7 +203,10 @@ export default { return { confirmLoading: false, disabled: false, - formInline:{}, + formInline:{ + sjky:'车辆解闭锁功能可用，但不可驾驶', + sjbkygn:'除解闭锁均不可用' + }, url: { exportData: '/ota/otaBaSjGgnrfs/exportData', importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入 @@ -255,7 +258,10 @@ export default { getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ - this.formInline= res.result ==null ? {} :res.result + this.formInline= res.result ==null ? { + sjky:'车辆解闭锁功能可用，但不可驾驶', + sjbkygn:'除解闭锁均不可用' + } :res.result this.formInline.id=res.result.id this.$forceUpdate() }