From 5d97758c14985c91e40fcbccca064b0bc2a4e951 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 10:24:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 ++- jero-web/src/common/lang/zh-cn.js | 3 ++- .../components/thetargetvehicleofthisupgrade.vue | 2 +- .../upgradeactivityrecord/components/upgradehavechanged.vue | 6 +++++- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- .../otamanagement/vehicleinformation/components/other.vue | 6 ++++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4b1d8cb60..1b0823753 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1508,7 +1508,7 @@ module.exports = { applicationconditions:'Application conditions', componentname:'Component name', fillincontent:'Fill in content', - upgradepacketprotectionmeasures:'Upgrade packet protection measures', + upgradepacketprotectionmeasuresa:'Software version (set) identification and storage', controlsystem:'This section describes how to identify and save the software upgrade version (set) of the electronic control system', vehicledynamictype:'Vehicle dynamic type', upgradetargetmodel:'Upgrade target model', @@ -1744,4 +1744,5 @@ module.exports = { uploadedfilelarger:'The uploaded file is larger than', marketCertificationListDetails:'Market Certification List Details', andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', + pleasefillintherange:'Please fill in the range', } \ 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 a188678b6..19e18f226 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1669,7 +1669,7 @@ module.exports = { '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' + '\n' + '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。', - // upgradepacketprotectionmeasures:'软件版本（集）识别与存储', + upgradepacketprotectionmeasuresa:'软件版本（集）识别与存储', otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施', authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)', failsafmechanism:'防失效保护机制(可多选)', @@ -1847,4 +1847,5 @@ module.exports = { marketCertificationList:'市场认证清单', marketCertificationListDetails:'市场认证清单详情', andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', + pleasefillintherange:'请填写范围', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index e153908bb..8e42cbf81 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -54,7 +54,7 @@ {{$t('VINcodelist')}} - diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 84873b48c..44d8d2237 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -58,7 +58,11 @@ - + + + {{ $t('yes') }} + {{ $t('not') }} + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 541e9bdae..0daffffe9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -53,10 +53,10 @@ - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index dc0c50501..2459e441a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -6,7 +6,7 @@
- {{$t('upgradepacketprotectionmeasures')}} + {{$t('upgradepacketprotectionmeasuresa')}}
Date: Mon, 3 Apr 2023 10:38:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A4=87=E6=A1=88-=E7=8E=B0=E5=9C=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=A6=81=E6=B1=82-=E7=BF=BB=E8=AF=91=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/upgradeRequirements.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 621c91ba3..f94553c1b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -9,7 +9,7 @@ {{$t('templateDownload')}}
- @@ -369,4 +369,8 @@ button { color: #00B3BE; border-color: #00B3BE; } + +.table { + white-space: break-spaces; +} \ No newline at end of file From 977940e5c5c364d496e1291d0db2c7ec4d6b735c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 10:41:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BC=96=E8=BE=91-=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E6=9C=89=E4=BA=BA=E5=91=98=E7=9A=84=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=B2=A1?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 fb7c4627c..d881e97b0 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -457,7 +457,7 @@ :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}" :personneQuery="formInline" :isSingleChoice="true" - v-if="visible" + v-if="personnelVisible" @change="PersonnelSelectionChange" :disabled="disabled" v-model="formInline.dutyPersonName"/> @@ -509,6 +509,7 @@ formInline: {}, confirmLoading: false, visible: false, + personnelVisible:false, yearNameDataList: [], rules: { serialNumber: [ @@ -631,6 +632,7 @@ addModel() { this.visible = true + this.personnelVisible = true this.title = this.$t('add') this.formInline = {} this.getRegulationNo() @@ -643,6 +645,7 @@ editModel(value) { this.formInline = {} this.visible = true + this.personnelVisible = true this.formInline = JSON.parse(JSON.stringify(value)) // if (this.formInline.deliverableType) { // this.formInline.deliverableType = this.formInline.deliverableType.split(',') @@ -659,6 +662,7 @@ }, handleCancel() { this.visible = false + this.personnelVisible = false }, handleSubmit() { this.$refs.ruleForm.validate(valid => { @@ -709,6 +713,7 @@ this.$message.success(this.$t('OperationSuccessful')) } this.visible = false + this.personnelVisible = false this.$emit('addModelForm') } else { this.$message.warning(res.message) @@ -831,9 +836,14 @@ this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value } + this.formInline = {...this.formInline} } else if (this.engineeringInterfacePersonList.length == 0) { this.formInline.sdt = undefined } + this.personnelVisible = false + this.$nextTick(()=>{ + this.personnelVisible = true + }) } else { this.$nextTick(() => { this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []