From 07a7400f4274810f722e19d42e41c54d464ae620 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 14 Apr 2023 14:17:11 +0800 Subject: [PATCH 1/3] bug 67942 --- jero-web/src/common/lang/zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 227b81d1a..8376edc88 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1638,7 +1638,7 @@ module.exports = { Taskconfirmationresult: '任务确认结果', Compliancetaskhandling: '符合性任务办理', resultofhandling: '处理结果', - networksecurityrequirements: '激光雷达', + networksecurityrequirements: '网络安全要求', upgradefunctionrequirements: '升级功能要求', usernotificationrequirement: '用户告知要求', ineffectiveupgrades: '应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级', From 505f4037c76b36f0e1bf79ca9779312baad23c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 14 Apr 2023 14:20:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batSetting.vue | 9 +++++++-- .../components/certificationList/index.vue | 20 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index b173f2f30..a157413a5 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -52,7 +52,7 @@ {{$t('engineeringInterfacePerson')}} - { this.ids = data || [] this.formInline = {} this.name = name + if (content && name == this.$t('BatchSetting')) { + this.formInline.dutyTerritory = content.dutyTerritory + this.queryPersonByProject(content.dutyTerritory) + } + this.formInline = { ...this.formInline } }) }, handleOk() { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 6f5b2c4af..c3bd46608 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -973,7 +973,25 @@ }, BatchSettingClick(name) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + let isTrue = false + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (!this.selectedRowKeysList[i].dutyTerritoryName) { + isTrue = true + break + } + for (let j = 1; j < this.selectedRowKeysList.length; j++) { + if (this.selectedRowKeysList[i].dutyTerritoryName != this.selectedRowKeysList[j].dutyTerritoryName) { + isTrue = true + break + } + } + } + if (!isTrue){ + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name,this.selectedRowKeysList[0]) + }else{ + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + } + } else { this.$message.warning(this.$t('selectLeastOne')) } From 2b86c5003f98fd50a33702c5f2f224ce6758bf33 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 14 Apr 2023 14:44:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=BF=80=E5=85=89=E9=9B=B7=E8=BE=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 + .../vehicleinformation/components/recordparameters.vue | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 712f06b0b..d5e94d464 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1786,4 +1786,5 @@ module.exports = { oneThePersonnelMustBeSelected:'One of the personnel must be selected', pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login', cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas', + lidar:'lidar', } \ 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 cdb386b4e..4b1e269d1 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1888,4 +1888,5 @@ module.exports = { oneThePersonnelMustBeSelected:'必须选择其中一个人员', pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据', cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人', + lidar:'激光雷达', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 7c4be4133..07dc0be6a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -14,8 +14,8 @@
{{$t('componentname')}} - - {{$t('networksecurityrequirements')}} + + {{$t('lidar')}} {{$t('millimeterwaveradar')}}