From 829f71fb287686d6db6d720ce7cced8dea2f9c95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 16:58:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?67051=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E6=9B=B4=E6=96=B0log=E5=85=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 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 d47c120e1..0cde55614 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 @@ -590,7 +590,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy); //设置更新log -// setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); + setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程 @@ -3752,14 +3752,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); -// String contentLog = username+"复制了“"+serialNumber+"”"; -// String enContentLog = username+" copied “"+serialNumber+"”"; -// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); -// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId(); + String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"复制了“"+serialNumber+"”"; + String enContentLog = username+" copied “"+serialNumber+"”"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); projectTaskInventoryEOList.forEach(taskInventory -> { this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); @@ -4052,15 +4052,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 17:10:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=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 | 21 ++++++++- .../informationaboutotherupgradetasks.vue | 44 ++++++++++++++++--- .../components/upgradeimpactassessment.vue | 7 ++- .../components/usernotification.vue | 28 +++++++++++- .../components/beupgradedonline.vue | 2 +- 5 files changed, 88 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 42ea1fcf1..e144bf3b1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -389,8 +389,25 @@ export default { }, // 引用备案 citeforrecord(){ - - }, + if( this.selectedRowKeys.length == 0 ){ + this.$message.warning(this.$t('selectLeastOne')) + }else{ + if ( this.selectedRowKeys.length > 1){ + this.$message.warning(this.$t('OnlyOneSelected')) + }else{ + localStorage.removeItem('otaIdT') + localStorage.removeItem('otaId') + localStorage.setItem('otaIdT',this.selectedRowKeys[0]) + if(localStorage.getItem('otaIdT')!=null){ + this.$router.push({ + path: '/upgradeactivityrecord', + query: { + type:1 + } + }) + } + } + }}, // 创建车型 createvehicleandfunctionrecords() { localStorage.removeItem('otaId') diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index 37d33f836..bd736b171 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -12,7 +12,7 @@ + v-model.trim="queryParam.rwmc"> @@ -29,7 +29,7 @@ @change="dateChange({db_field_name:'updatereleasetime'})" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParam.updatereleasetime" + v-model="queryParam.sjfbsj" :disabled="false" style="width: 100%"/> @@ -48,7 +48,7 @@ @change="dateChange({db_field_name:'upgradeplanexpirationtime'})" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParam.upgradeplanexpirationtime" + v-model="queryParam.sjjzsj" :disabled="false" style="width: 100%"/> @@ -58,7 +58,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('submit')}}
@@ -77,21 +77,51 @@ export default { return { confirmLoading: false, disabled: false, - queryParam:{} + queryParam:{ + sjjzsj:'' + } } }, mounted() { - + this.getData() }, methods: { + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + if(res.code == 200){ + this.queryParam= res.result ==null ? {} :res.result + } + }) + }, + save(){ + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.queryParam.otaId = otaId + postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) + console.log(res); + }) + }, + last(){ + this.save() this.$emit('otherup') }, dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, submit(){ - + this.$router.push('upgradeactivity') }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 3c081c5b6..d78323297 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -389,8 +389,11 @@ this.$forceUpdate() }) }, save(){ - - this.form.otaId=localStorage.getItem('otaId') + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.form.otaId=otaId postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ this.$message.success(this.$t('SavedSuccessfully')) console.log(res); diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index ee2864893..7a9539fd0 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -178,6 +178,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage' import ImportFile from '@/components/ImportFileData/index' import uploadFile from '@/components/uploadFile/file' import moment from 'moment' +import { post } from '../../../../common/lang/zh-cn' export default { name: 'basicInformation', @@ -197,7 +198,7 @@ export default { } }, mounted() { - + this.getData() }, methods: {// 模板下载 handleModule() { @@ -228,8 +229,31 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + if(res.code == 200){ + this.formInline= res.result ==null ? {} :res.result + } + }) + }, save(){ - + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.formInline.otaId = otaId + postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) + console.log(res); + }) }, next(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index d3a2a4bd3..11ffac9e6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -72,7 +72,7 @@ - + From 995130a9bdd1639d84f60f242b9325ff404a4a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 17:14:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/auxiliaryupgradehavechanged.vue | 12 ++++++++---- .../components/thetargetvehicleofthisupgrade.vue | 12 ++++++------ .../components/upgradehavechanged.vue | 7 ++----- .../components/usernotification.vue | 1 + 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 73cd82371..eddd0a7a9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1721,4 +1721,5 @@ module.exports = { cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', + noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 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 9369a1133..456f5bb73 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1821,6 +1821,7 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", + noteone:'注:支持CSV格式，大小20M以内，数量1-10个', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index d6fc8f2b7..c664a3c94 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -43,9 +43,9 @@ - - - + + + {{$t('add')}} @@ -54,6 +54,10 @@
{{$t('uploadattachment')}} +
+

{{$t('note')}}

+

    {{$t('format')}}

+
{{$t('preservation')}} @@ -79,7 +83,7 @@ export default { return { dataSource: [ { - + } ], loading: false, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 57d4712a5..3b8a3e96a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -76,16 +76,16 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || - formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') + formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') }} -

支持cxv格式，大下20M以内，数量1-10个

+

{{$t('noteone')}}

- +
@@ -148,18 +148,18 @@ export default { }) }, save(){ - + let obj={} obj.otaId=localStorage.getItem('otaId') obj.zsl = this.formInline.zsl if(this.formInline.dateofproduction){ - obj.scrqks = this.formInline.dateofproduction[0] + obj.scrqks = this.formInline.dateofproduction[0] obj.scrqjs = this.formInline.dateofproduction[1] }else{ obj.scrqks='' obj.scrqjs ='' } - + obj.vinList = this.formInline.vinList postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ this.$message.success(this.$t('SavedSuccessfully')) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index ccf6ef607..4715ff8ba 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -66,9 +66,6 @@ {{$t('delete')}} -
- {{$t('uploadattachment')}} -
{{$t('preservation')}} {{$t('last')}} @@ -146,7 +143,7 @@ export default { ellipsis: true, width: 170, scopedSlots: { customRender: 'nameoftheupgradedelectroniccontroller' }, - + }, { title: this.$t('adaptivehardwareversion'), @@ -188,7 +185,7 @@ export default { width: 170, scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' }, }, - + { title: this.$t('upgradepackageintegrityverificationdata'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index ee2864893..d3e2be2b7 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -158,6 +158,7 @@ formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} +

{{$t('format')}}