diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 535dd71ce..65c93d40b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1701,5 +1701,12 @@ module.exports = { returntofill:'Return to fill', thereAreCurrentlyNoRegulationsToHandle:'There are currently no regulations to handle', certificationSubmission:'Certification Submission', + upgradecompletion:'Upgrade completion', + implementedupgrade:'Whether the implemented upgrade is consistent with the record', + numberofvehicles:'Number of vehicles that have completed upgrades', + vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade', + cause:'cause', + implementationrecords:'Fault handling measures and emergency response implementation records', + } \ 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 4c9c614cb..027eb8a72 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1801,4 +1801,10 @@ module.exports = { expeditionProcess:'催办流程', thereAreCurrentlyNoRegulationsToHandle:'当前没有可处理的法规', certificationSubmission:'认证提交', + upgradecompletion:'升级完成情况', + implementedupgrade:'实施的升级是否和备案一致', + numberofvehicles:'完成升级的车辆数', + vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因', + cause:'原因', + implementationrecords:'故障处置措施和应急响应实施记录', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 612427415..8440de293 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -19,7 +19,7 @@ {{$t('recordstatus')}} - @@ -36,10 +36,10 @@ @@ -54,7 +54,7 @@ @@ -75,7 +75,9 @@ export default { return { visible: false, confirmLoading: false, - formInline: {}, + formInline: { + batjs:'', + }, rules: { // listConfirmation: [ // { @@ -134,7 +136,13 @@ export default { }, methods: { edit(row) { - console.log(row) + if(row instanceof Array){ + this.ids = row + }else{ + this.formInline.bazt = row.bazt + this.formInline.batjs = row.batjs + this.formInline.bz = row.bz + } this.visible = true this.$nextTick(() => { this.$refs.ruleForm.clearValidate() @@ -145,14 +153,17 @@ export default { if (valid) { let query = { ...this.formInline, + id:this.ids.join(',') } this.confirmLoading = true - postAction('', query).then((res) => { + postAction('ota/otaBaSjList/batchRecord', { + recordList :query + }).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('settingListForm') + this.$emit('getList') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -162,7 +173,10 @@ export default { }) }, handleCancel() { - this.formInline = {} + this.formInline = { + batjs:'' + } + this.ids = [] this.visible = false }, dateChange(item) { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index dbd4052f3..9cf5e3567 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -163,7 +163,7 @@ /> - + @@ -351,14 +351,14 @@ export default { ...queryParam } this.loading = true - getAction('/ota/otaBaSjList/list', query).then((res) => { + getAction('/ota/otaBaSjList/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { @@ -437,7 +437,7 @@ export default { if(this.selectedRowKeys.length < 1){ this.$message.warning(this.$t('selectLeastOne')) }else{ - this.$refs.maintenanceRef.edit() + this.$refs.maintenanceRef.edit(this.selectedRowKeys) } }, // 模板下载 diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 13b4c1751..8b904a6a1 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -36,11 +36,10 @@ @@ -75,7 +74,9 @@ export default { return { visible: false, confirmLoading: false, - formInline: {}, + formInline: { + batjs:'', + }, rules: { // listConfirmation: [ // { @@ -134,8 +135,12 @@ export default { }, methods: { edit(row) { - if(row){ - this.formInline = {...row} + if(row instanceof Array){ + this.ids = row + }else{ + this.formInline.bazt = row.bazt + this.formInline.batjs = row.batjs + this.formInline.bz = row.bz } this.visible = true this.$nextTick(() => { @@ -147,14 +152,17 @@ export default { if (valid) { let query = { ...this.formInline, + id:this.ids.join(',') } this.confirmLoading = true - postAction('', query).then((res) => { + postAction('ota/otaBaCxList/batchRecord', { + recordList: query + }).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('settingListForm') + this.$emit('getList') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -164,7 +172,10 @@ export default { }) }, handleCancel() { - this.formInline = {} + this.formInline = { + batjs:'' + } + this.ids = [] this.visible = false }, dateChange(item) { diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 30249e4a9..21b7eec3e 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -161,7 +161,7 @@ /> - + @@ -346,14 +346,14 @@ export default { ...queryParam } this.loading = true - getAction('/ota/otaBaCxList/list', query).then((res) => { + getAction('/ota/otaBaCxList/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { @@ -432,7 +432,7 @@ export default { if(this.selectedRowKeys.length < 1){ this.$message.warning(this.$t('selectLeastOne')) }else{ - this.$refs.maintenanceRef.edit() + this.$refs.maintenanceRef.edit(this.selectedRowKeys) } }, // 模板下载