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 df309f54b..e7331dcc2 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 @@ -2251,7 +2251,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(transferUserId.split(",")); List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); this.sendMessageByTemplateId( @@ -2427,7 +2427,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("截止日期") + 1; + index = list.indexOf("*截止日期") + 1; }else{ - index = list.indexOf("Due Date") + 1; + index = list.indexOf("*Due Date") + 1; } //创建临时文件夹 @@ -3087,25 +3087,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl - - - - {{ $t('yes') }} - {{ $t('not') }} - + + - - - - {{ $t('yes') }} - {{ $t('not') }} - + + - - - - - - + - - + + + + + + + + + + + + + + + + + + - {{$t('addcontroller')}} - {{$t('addfunction')}} - {{$t('delete')}} + {{$t('add')}} + {{$t('delete')}}
@@ -86,8 +84,7 @@ export default { return { dataSource: [ { - key:1, - functionname:'ceshi', + } ], loading: false, @@ -98,108 +95,83 @@ export default { align: 'left', dataIndex: 'functionname', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functionname' }, }, { - title: this.$t('configuration'), + title: this.$t('upgradedestinationype'), align: 'left', - dataIndex: 'configuration', + dataIndex: 'upgradedestinationype', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradedestinationype' }, + }, + { + title: this.$t('adjustmentofchangedBulletinparameters'), + align: 'left', + dataIndex: 'adjustmentofchangedBulletinparameters', + ellipsis: true, + width: 170, + children: [ + { + title: this.$t('preupgrade'), + align: 'left', + dataIndex: 'preupgrade', + ellipsis: true, + width: 170, + scopedSlots: { customRender: 'preupgrade' }, + }, + { + title: this.$t('afterupgrade'), + align: 'left', + dataIndex: 'afterupgrade', + ellipsis: true, + width: 170, + scopedSlots: { customRender: 'afterupgrade' }, + }, + ] }, { - title: this.$t('whetheritcanbeupgraded'), + title: this.$t('functionalchangedescription'), align: 'left', - dataIndex: 'whetheritcanbeupgraded', + dataIndex: 'functionalchangedescription', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functionalchangedescription' }, }, { - title: this.$t('drivingautomationlevel'), + title: this.$t('variationofapplicableconditions'), align: 'left', - dataIndex: 'drivingautomationlevel', + dataIndex: 'variationofapplicableconditions', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'variationofapplicableconditions' }, }, { - title: this.$t('technicalparameters'), + title: this.$t('upgradetheelectroniccontrollerinvolved'), align: 'left', - dataIndex: 'technicalparameters', + dataIndex: 'upgradetheelectroniccontrollerinvolved', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, { title: this.$t('functiondescription'), align: 'left', dataIndex: 'functiondescription', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functiondescription' }, }, { title: this.$t('applicationconditions'), align: 'left', dataIndex: 'applicationconditions', ellipsis: true, - width: 170 - }, - { - title: this.$t('controllerparameter'), - align: 'left', - dataIndex: 'controllerparameter', - ellipsis: true, width: 170, - children: [ - { - title: this.$t('electronic'), - align: 'left', - dataIndex: 'electronic', - ellipsis: true, - width: 170 - }, - { - title: this.$t('electroniccontrollerproductionenterprises'), - align: 'left', - dataIndex: 'electroniccontrollerproductionenterprises', - ellipsis: true, - width: 170 - }, - { - title: this.$t('electroniccontrollertype'), - align: 'left', - dataIndex: 'electroniccontrollertype', - ellipsis: true, - width: 170 - }, - { - title: this.$t('hardwareversioninformation'), - align: 'left', - dataIndex: 'hardwareversioninformation', - ellipsis: true, - width: 170 - }, - { - title: this.$t('softwaredevelopmententerprise'), - align: 'left', - dataIndex: 'softwaredevelopmententerprise', - ellipsis: true, - width: 170 - }, - { - title: this.$t('operatingsystemversion'), - align: 'left', - dataIndex: 'operatingsystemversion', - ellipsis: true, - width: 170 - }, - { - title: this.$t('inflammatorydata'), - align: 'left', - dataIndex: 'inflammatorydata', - ellipsis: true, - width: 170 - }, - ] + scopedSlots: { customRender: 'applicationconditions' }, }, + { title: this.$t('operation'), align: 'left', @@ -216,6 +188,7 @@ export default { }, mounted() { // this.getList() + this.getData() }, methods: { // 模板下载 @@ -250,12 +223,40 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + this.dataSource =res.result.list == null ? {} : res.result.list + }) + }, + save(){ + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) + }) + }, last(){ + this.save() this.$emit('beupgradedonlineup') }, next(){ + this.save() this.$emit('beupgradedonlinedown') }, + addlineAtBot(){ + let obj={} + this.dataSource.push(obj) + }, + deleteData(record){ + this.dataSource.splice(this.dataSource.indexOf(record),1) + }, uploadSuccess(data) { let attIdList = [] if (data && data.length > 0) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8a9ba250d..4193f643a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -37,34 +37,28 @@ - + - + - + - + - - - - - - - + - + - + - + @@ -76,7 +70,7 @@ {{$t('uploadattachment')}}
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -194,22 +188,7 @@ export default { width: 170, scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' }, }, - { - title: this.$t('softwaredevelopmententerprise'), - align: 'left', - dataIndex: 'softwaredevelopmententerprise', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'softwaredevelopmententerprise' }, - }, - { - title: this.$t('initialpackageforintegrityinflammatorydata'), - align: 'left', - dataIndex: 'initialpackageforintegrityinflammatorydata', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'initialpackageforintegrityinflammatorydata' }, - }, + { title: this.$t('upgradepackageintegrityverificationdata'), align: 'left', @@ -252,6 +231,7 @@ export default { }, mounted() { // this.getList() + this.getData() }, methods: { // 模板下载 @@ -298,10 +278,31 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + this.dataSource =res.result.list == null ? {} : res.result.list + }) + }, + save(){ + postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) + }) + }, last(){ + this.save() this.$emit('upgradedonlineup') }, next(){ + this.save() this.$emit('upgradedonlinedown') }, addlineAtBot(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 667cd5f32..82ae11e47 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -360,10 +360,14 @@ import { message } from 'ant-design-vue' }) }, - async save(){ + save(){ this.$refs.ruleForm.validate(valid=>{ if(valid){ - postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => { + let otaId = localStorage.getItem('otaId') + 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) this.$message.success(this.$t('SavedSuccessfully')) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index f19001a77..17df00500 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -95,7 +95,7 @@
{{$t('fillincontent')}} - + {{ $t('yes') }} {{ $t('not') }} @@ -299,7 +299,7 @@ export default { }, dataSource: [ { - key: 'wlaqyqSl', + key: 'jgldSl', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -307,7 +307,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'wlaqyqBzwz', + key: 'jgldBzwz', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -315,7 +315,7 @@ export default { fillincontent:this.$t('forwardXquantity'), }, { - key: 'wlaqyqGgxh', + key: 'jgldGgxh', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -323,7 +323,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'wlaqyqScqy', + key: 'jgldScqy', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), @@ -890,10 +890,6 @@ export default { this.dataSource.forEach(item=>{ for(let key in res.result.bj){ - if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0 && key !='id'){ - console.log(key); - res.result.bj[key]=Number(res.result.bj[key]) - } if(item.key==key){ item.val=res.result.bj[key] } diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 8417b5850..a3013d2a5 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -179,7 +179,7 @@
+ @click="clickButtonToUpload('deliverableTemplate',index,true)"> {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === '' || item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -719,12 +719,19 @@ } this.formInline = { ...this.formInline } }, - clickButtonToUpload(item, index) { + clickButtonToUpload(item, index,isTrue) { this.numIndex = index this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item - getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + let ids = '' + console.log(index) + if (isTrue){ + ids = this.formInline.dataList[index][item] + }else{ + ids = this.formInline[item] + } + getAction('sys/common/getFileInfos', { id: ids }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 3b0869ae9..907e6582d 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -1,148 +1,153 @@