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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -2301,7 +2301,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
-		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
+//		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
 
 		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -19,6 +19,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            and project_name is not null
             <if test="params.projectName != null and params.projectName !=''">
                 and (
                     temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')

jero-web/src/common/lang/en-us.js

@@ -1734,5 +1734,9 @@ module.exports = {
   gnxtwh:'Functional system maintenance',
   gnxt:'Functional system',
   dykzq:'Corresponding controller',
+  releaseRegulatoryList:'Release of regulatory list',
+  preHomoFlow:'Pre-Homo flow',
+  verifyConformanceConfirmation:'Verify conformance confirmation',
+  designConformanceVerification:'Design conformance verification',
   nomorethan:'No more than 10',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1836,5 +1836,9 @@ module.exports = {
   gnxtwh:'功能系统维护',
   gnxt:'功能系统',
   dykzq:'对应控制器',
+  releaseRegulatoryList:'法规清单发布',
+  preHomoFlow:'Pre-Homo流程',
+  verifyConformanceConfirmation:'验证符合性确认',
+  designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
 }

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -201,7 +201,8 @@ export default {
       //url传参严格按照当前命名
       url: {
         list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
-        deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch'
+        deleteBatch: '/ota/otaBaSjList/delete'
+      
       },
       visible: false,
       loading: false,
@@ -388,7 +389,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+          deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -32,7 +32,7 @@
           <a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
       </span>
       <span slot="afterupgrade" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
       </span>
       <span slot="functionalchangedescription" slot-scope="text,record">
         <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
@@ -87,7 +87,9 @@ export default {
     return {
       dataSource: [
         {
-
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
         }
       ],
       fileList:'',
@@ -219,7 +221,11 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }] : res.result.list
           this.fileList = res.result.fj
         })
     },
@@ -276,7 +282,11 @@ export default {
       this.$emit('beupgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -90,6 +90,8 @@ export default {
     return {
       dataSource: [
         {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
         }
       ],
       loading: false,
@@ -285,7 +287,10 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }] : res.result.list
         })
     },
     save(){
@@ -317,7 +322,10 @@ export default {
       this.$emit('upgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -203,7 +203,10 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{},
+      formInline:{
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      },
       url: {
         exportData: '/ota/otaBaSjGgnrfs/exportData',
         importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入
@@ -255,7 +258,10 @@ export default {
         getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           if(res.code == 200){
           
-            this.formInline= res.result ==null ? {} :res.result 
+            this.formInline= res.result ==null ? {
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      } :res.result 
             this.formInline.id=res.result.id
             this.$forceUpdate()
           }

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -124,24 +124,24 @@
         },
         toggleSearchStatus: false,
         taskTypeList: [
+          // {
+          //   name: this.$t('confirmationOfRegulationsList'),
+          //   value: '10'
+          // },
           {
-            name: this.$t('confirmationOfRegulationsList'),
+            name: this.$t('releaseRegulatoryList'),
             value: '10'
           },
           {
-            name: this.$t('listTaskConfirmation'),
+            name: this.$t('designConformanceVerification'),
-            value: '1'
-          },
-          {
-            name: this.$t('designComplianceReview'),
             value: '2'
           },
           {
-            name: this.$t('preHomeConfirmation'),
+            name: this.$t('preHomoFlow'),
-            value: '3'
+            value: '21'
           },
           {
-            name: this.$t('verificationComplianceReview'),
+            name: this.$t('verifyConformanceConfirmation'),
             value: '4'
           }
         ],