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 0dd332c63..4b1e269d1 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: '应保护升级包的真实性和完整性,以合理地防止其受到损害,并合理地防止无效升级',
@@ -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')}}
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'))
}