Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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',
 }

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:'激光雷达',
 }

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -14,8 +14,8 @@
     <div style='display: flex;margin-bottom: 40px;'>
       <div style='width: 400px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('componentname')}}</span>
-        <span class='radio-text' :title="$t('networksecurityrequirements')">
+        <span class='radio-text' :title="$t('lidar')">
-          {{$t('networksecurityrequirements')}}
+          {{$t('lidar')}}
         </span>
         <span class='radio-text' :title="$t('millimeterwaveradar')">
           {{$t('millimeterwaveradar')}}

jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue

@@ -52,7 +52,7 @@
               <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
                         class="box-input"
                         allowClear
                         optionFilterProp="label"
@@ -187,13 +187,18 @@
           }
         })
       },
-      edit(data, name) {
+      edit(data, name,content) {
         this.visible = true
         this.getDeliverableTree()
         this.$nextTick(() => {
           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() {

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'))
         }