From 5c92369300cfcb87b01b039f2bceb03a350df8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 29 Mar 2023 09:25:38 +0800 Subject: [PATCH 01/21] =?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=9A=84=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/TaskListModel.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 06ca28a16..7eac348a5 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -255,9 +255,10 @@ let Action if (this.title == this.$t('CertificationProgress')) { query = { - id: this.formInline.id, - certificationProgress: this.formInline.certificationProgress, - certificationProgressRemark: this.formInline.certificationProgressRemark + ...this.formInline + // id: this.formInline.id, + // certificationProgress: this.formInline.certificationProgress, + // certificationProgressRemark: this.formInline.certificationProgressRemark } url = this.url.edit Action = putAction From d97c5447c0c0e07faf8ff750e68af7fe6461e8a0 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 09:39:16 +0800 Subject: [PATCH 02/21] =?UTF-8?q?67382=20=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=9C=A8=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1f8ef5937..4b6431dae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9931,8 +9931,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = new ArrayList<>(); + /*List certificationEngineerList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName(); @@ -9962,7 +9961,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl engineeringInterfacePersonList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ @@ -9970,12 +9969,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 10:05:35 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/globalAdvancedQuery/index.vue | 6 +++--- .../components/listAddModel.vue | 12 ++++++------ .../components/modules/addModel.vue | 16 ++++++++-------- .../components/virtualListDetails.vue | 14 +++++++------- .../ParameterItemCollectionList.vue | 17 ++++++++--------- .../components/certificationList/index.vue | 11 +++++------ .../components/listAddModel.vue | 12 ++++++------ .../components/listOfRegulations.vue | 11 +++++------ .../src/views/regulationsKanban/index.vue | 19 +++++++++---------- 9 files changed, 57 insertions(+), 61 deletions(-) diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index b8e71934d..82c5b4f2b 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -11,15 +11,15 @@ {{$t('empty')}} - + {{$t('advancedQuery')}} - + - {{$t('advancedQuery')}} + {{$t('advancedQuery')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue index 83303ced2..891996117 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue @@ -45,15 +45,15 @@ - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 41ef684b2..e2577d9e7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -94,15 +94,15 @@ - - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 9fe341730..968fc7dff 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -110,16 +110,15 @@ class="table-page-search-submitButtons"> - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 48626c18f..0c407627d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -48,12 +48,11 @@ - - {{ $t('query') }} - {{ $t('reset') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue index 357bafbd2..e639112d9 100644 --- a/jero-web/src/views/projectManagement/components/listAddModel.vue +++ b/jero-web/src/views/projectManagement/components/listAddModel.vue @@ -45,15 +45,15 @@ + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 34ba87b53..e3c918e25 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -79,12 +79,11 @@ - - {{ $t('query') }} - {{ $t('reset') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 7bce34131..2f6e21cb8 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -54,16 +54,15 @@ - - {{ $t('query') }} - {{ $t('reset') }} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} + From d317ece1d23eb3c228ce56ce44ddb6e004ea7019 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 10:15:31 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivity/components/upgradecompletion.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 8b1479d10..3fa22b2c4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -152,6 +152,7 @@ {{ (formInline.ssjlfj === 'null' || formInline.ssjlfj === '' || formInline.ssjlfj == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -243,10 +244,17 @@ export default { this.showButton=true } this.record=record - this.visible = true this.confirmLoading = false - console.log('555',record); + console.log('555',record); + getAction('/ota/otaBaSjJssj/queryByOtaId',{otaId:this.record.id}).then(res=>{ + if(res.code==200){ + this.formInline=res.result ==null? {list:[{}]} :res.result + if(res.result.list==null ||res.result.list.length==0){ + this.formInline.list=[{}] + } + } + }) this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() From b14a95dda7a58ca9fa355f79f74b4c4dcd9017bc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 10:21:18 +0800 Subject: [PATCH 05/21] =?UTF-8?q?67133=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=82=AC=E5=8A=9E=E8=B4=A3=E4=BB=BB=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=BB=BB=E5=8A=A1=E5=BE=85=E7=A1=AE=E8=AE=A4=E4=B8=8E?= =?UTF-8?q?=EF=BC=88=E7=BB=93=E6=9E=9C=E5=BE=85=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E9=80=80=E5=9B=9E=EF=BC=89=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=88=86=E5=BC=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 93499a10a..7503fdf02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2388,16 +2388,44 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> map : certifycationInventoryListByDutyPersonMap.entrySet()) { String key = map.getKey(); - List value = map.getValue(); List userIdList = Arrays.asList(key.split(",")); - // 给责任人发消息 - this.sendMessageByTemplateId( - value, - TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(), - userIdList, - dutyPersonList - ); + // 任务待确认状态的数据：发送认证任务确认的催办消息 + List toBeConfirmedPciEoList = map.getValue().stream().filter(pciEo -> { + boolean flag = false; + if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(toBeConfirmedPciEoList)) { + // 给责任人发消息 + this.sendMessageByTemplateId( + toBeConfirmedPciEoList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue(), + userIdList, + dutyPersonList + ); + } + + List toBeSubmitOrReturnPciEoList = map.getValue().stream().filter(pciEo -> { + boolean flag = false; + if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if (CollectionUtils.isNotEmpty(toBeSubmitOrReturnPciEoList)) { + // 给责任人发消息 + this.sendMessageByTemplateId( + toBeSubmitOrReturnPciEoList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(), + userIdList, + dutyPersonList + ); + } /*// 待提交数据 单独发消息 List toBeSubmitDataList = value.stream().filter(v -> { From 1b24757bc3d781fc059a9e7e6d42b189d5b3cb6b Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 10:49:54 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 6 +++--- .../vehicleregistration/components/maintenance.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 658e2efeb..6018ef0da 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -149,9 +149,9 @@ @click="maintenanceClick(record)">{{$t('maintenance')}} {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="record.sjzt==0 && record.bazt=='4'">{{$t('endUpgrade')}} {{$t('upgradecompletion')}} + @click="endUpgrade(record , '1')" v-if="record.sjzt==1">{{$t('upgradecompletion')}} {{$t('export')}} { + postAction('ota/otaBaSjList/batchRecord', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false From cb1293457df7402703a3f24d7ce49d587c981afc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 10:50:18 +0800 Subject: [PATCH 07/21] update --- .../IProjectCertificationInventoryEOService.java | 2 +- .../ProjectCertificationInventoryEOServiceImpl.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index a9011b79f..08f3f68e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -233,5 +233,5 @@ public interface IProjectCertificationInventoryEOService extends IService dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result); + List dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result,String projectLibraryId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 7503fdf02..076fee61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -349,7 +349,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result); + List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId); if(CollectionUtils.isNotEmpty(saveDataList)){ this.saveBatch(saveDataList); @@ -499,10 +499,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result) { + public List dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result,String projectLibraryId) { List pciSaveList = new ArrayList<>(); - List allDataList = this.list(); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); + List allDataList = this.list(pciQueryWrap); // 重复数据数组 List duplicateDataList = allDataList.stream().filter(data -> { boolean flag = false; @@ -2664,7 +2666,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result); + List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); this.saveBatch(saveDataList); Date now = new Date(); From 658141010d82ce2ff402e5b1538e01eb5a49ae93 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 10:51:49 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AF=B9=E6=8E=A5?= 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 + .../upgradeactivity/components/gnxtwh.vue | 110 ++++++++++++++---- 3 files changed, 90 insertions(+), 22 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 18121d70b..8a2f611e0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1734,4 +1734,5 @@ module.exports = { gnxtwh:'Functional system maintenance', gnxt:'Functional system', dykzq:'Corresponding controller', + nomorethan:'No more than 10', } \ 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 2f643ba49..c50b848cf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1836,4 +1836,5 @@ module.exports = { gnxtwh:'功能系统维护', gnxt:'功能系统', dykzq:'对应控制器', + nomorethan:'不能超过10个', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 1cf59e6b4..4a73f8b06 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -28,7 +28,7 @@ > - {{text && text.length > 10?text.slice(0,9)+'...':text}} + {{text && text.length > 100?text.slice(0,99)+'...':text}} @@ -58,7 +58,7 @@ - +
@@ -75,32 +75,37 @@ {{$t('gnxt')}}
- +
-
- {{$t('dykzq')}} - - -
-
- +
+
{{$t('dykzq') + (index+1)}}
- + +
+ + +
@@ -115,7 +120,7 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index fb6045b3d..5e791007d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -10,59 +10,30 @@ {{$t('templateDownload')}}
- - - - {{$t('upgradePurpose')}} - - - - - - - - {{$t('impactassessmentofupgradeactivities')}} - - - {{$t('correspondingvehicletype')}} - {{$t('technicalperformancechanges')}} - {{$t('technicalstandardsandsafetytechnicalconditions')}} - {{$t('autoautonomousdrivingfunction')}} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('upgradePurpose')}} + +
{{$t('impactassessmentofupgradeactivities')}}{{$t('correspondingvehicletype')}} + + {{ $t('yes') }} + {{ $t('not') }} + + {{ (form.bgfj === 'null' || form.bgfj === '' || @@ -71,86 +42,121 @@ {{$t('notetwo')}} {{$t('format')}} - - -
-
- {{$t('vehiclepriortothereleaseoftheupgrade')}} - {{$t('conditionsareupgradesperformed')}} - {{$t('upgradefailureorinterruption')}} - {{$t('upgradeactivitiesaffectvehiclesafety')}} - {{$t('upgradeactivityprovidesuserconfirmationoptions')}} - {{$t('upgradepackagetest')}} - {{$t('reliabilityofonlineupgradeactivities')}} -
-
- - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - -
-
+
{{$t('technicalperformancechanges')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('technicalstandardsandsafetytechnicalconditions')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('autoautonomousdrivingfunction')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('vehiclepriortothereleaseoftheupgrade')}} + + {{ $t('yes') }} + {{ $t('not') }} + + {{ (form.clfj === 'null' || form.clfj === '' || form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} - {{$t('notethree')}} + {{$t('notetwo')}} {{$t('format')}} - - - +
{{$t('conditionsareupgradesperformed')}} + +
{{$t('upgradefailureorinterruption')}} + +
{{$t('upgradeactivitiesaffectvehiclesafety')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('upgradeactivityprovidesuserconfirmationoptions')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('upgradepackagetest')}} + +
{{$t('reliabilityofonlineupgradeactivities')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('preservation')}} {{$t('last')}} @@ -426,6 +432,7 @@ this.$forceUpdate() .bootom-button{ text-align: center!important; + margin-top: 40px; } .text-operation{ From 06b6428cc7ce0c1ffc2bd95a1215e19e0a7f22b5 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 11:46:49 +0800 Subject: [PATCH 16/21] =?UTF-8?q?67523=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E8=AE=A1=E6=88=96=E9=AA=8C=E8=AF=81=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=20=20=E5=8F=AA=E8=A6=81=E6=9C=89=E4=B8=AA?= =?UTF-8?q?=E4=B8=80=E5=8C=85=E5=90=AB=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 4b6431dae..14b4bc427 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1117,7 +1117,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ queryWrapper.eq("regulation_owner_id",currentUser.getId()). - or().eq("homologation_engineer_id",currentUser.getId()); + or().eq("engineering_interface_person",currentUser.getId()). + or().eq("design_duty_id",currentUser.getId()). + or().eq("verify_duty_id",currentUser.getId()); }); } List result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); From f61e48f4390967caeec09b9736f7eb25bb48de98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 12:47:04 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2-?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/AssignedBy/index.vue | 4 ++-- jero-web/src/components/AssignedByHomo/index.vue | 4 ++-- .../src/components/ParameterLibraryAdd/index.vue | 4 ++-- jero-web/src/components/SplitSearch/index.vue | 10 +++++----- jero-web/src/components/currencySearch/index.vue | 12 ++++++------ jero-web/src/components/search/index.vue | 6 +++--- jero-web/src/components/searchaloneorcfile/index.vue | 10 +++++----- jero-web/src/components/searchalonesplit/index.vue | 12 ++++++------ jero-web/src/components/searchalonetext/index.vue | 10 +++++----- jero-web/src/views/dashboard/customContentList.vue | 4 ++-- .../src/views/documentManage/collection/index.vue | 4 ++-- .../src/views/documentManage/subscribtion/index.vue | 4 ++-- .../src/views/documentManage/tags/dialog/DicList.vue | 3 ++- .../views/documentManage/tags/tabs/TagContent.vue | 4 ++-- .../src/views/documentManage/tags/tabs/TagItem.vue | 4 ++-- .../components/initiateComparison.vue | 10 ++++------ .../views/documentTools/documentComparison/index.vue | 2 +- .../components/RetrieveFilesList.vue | 8 ++++---- .../documentTools/documentTranslation/index.vue | 10 +++++----- .../searchCenter/components/DocumentLibrary.vue | 5 ++--- .../searchCenter/components/problemKnowledgeBase.vue | 5 ++--- .../virtualList/components/addModel.vue | 12 ++++++------ .../virtualList/components/transferList.vue | 4 ++-- .../src/views/documentTools/virtualList/index.vue | 4 ++-- .../views/otamanagement/upgradeactivity/index.vue | 12 ++++++------ .../otamanagement/vehicleregistration/index.vue | 12 ++++++------ .../src/views/parameter/ParameterTemplate/index.vue | 4 ++-- .../src/views/parameter/escalationlibrary/index.vue | 4 ++-- .../src/views/parameter/managementdetails/index.vue | 6 +++--- .../src/views/parameter/parameterexport/index.vue | 4 ++-- jero-web/src/views/parameter/parameterlist/index.vue | 4 ++-- .../components/TaskParameterCollection.vue | 4 ++-- .../components/referenceDeliverablesList.vue | 4 ++-- .../certificationList/components/transferList.vue | 4 ++-- .../components/listOfRelevantPersonnel.vue | 8 ++++---- .../projectManagement/components/nonConformance.vue | 4 ++-- .../projectManagement/components/transferList.vue | 4 ++-- .../projectManagement/dialog/ParameterTemplate.vue | 4 ++-- .../dialog/ParameterTemplateAdd.vue | 4 ++-- .../dialog/ProjectCollectionParameters.vue | 4 ++-- .../projectManagement/dialog/parametercolumn.vue | 4 ++-- .../views/projectManagement/projectLibrary/index.vue | 6 +++--- .../projectNonConformance/index.vue | 6 +++--- .../projectStatusBoard/components/TaskPlanList.vue | 4 ++-- .../projectManagement/projectStatusBoard/index.vue | 4 ++-- .../views/regulationsKanban/components/addModel.vue | 4 ++-- jero-web/src/views/system/DictList.vue | 4 ++-- jero-web/src/views/system/RoleUserList.vue | 4 ++-- jero-web/src/views/system/UserAnnouncementList.vue | 4 ++-- jero-web/src/views/system/UserList.vue | 6 +++--- jero-web/src/views/system/modules/DeptUserInfo.vue | 4 ++-- .../views/toDoCenter/projectParameterTasks/index.vue | 4 ++-- .../toDoCenter/projectRegulationTasks/index.vue | 8 ++++---- .../toDoCenter/regulatoryAssessmentTasks/index.vue | 4 ++-- .../components/transferList.vue | 8 ++++---- .../src/views/virtualAuthenticationList/index.vue | 4 ++-- .../certificationListMaintenance.vue | 9 ++++----- 57 files changed, 162 insertions(+), 166 deletions(-) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 0346fa84c..cd5d2c05b 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -23,8 +23,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/AssignedByHomo/index.vue b/jero-web/src/components/AssignedByHomo/index.vue index 1e5cce5f5..67cebc36f 100644 --- a/jero-web/src/components/AssignedByHomo/index.vue +++ b/jero-web/src/components/AssignedByHomo/index.vue @@ -23,8 +23,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index 4d972d944..3d409a54e 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -46,8 +46,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue index 077aa9be9..615a561d3 100644 --- a/jero-web/src/components/SplitSearch/index.vue +++ b/jero-web/src/components/SplitSearch/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue index fd3adad5c..b295f13b0 100644 --- a/jero-web/src/components/currencySearch/index.vue +++ b/jero-web/src/components/currencySearch/index.vue @@ -135,12 +135,12 @@ - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5b2671df5..af43a52be 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -174,12 +174,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/searchaloneorcfile/index.vue b/jero-web/src/components/searchaloneorcfile/index.vue index 4a65293a5..0daf05a31 100644 --- a/jero-web/src/components/searchaloneorcfile/index.vue +++ b/jero-web/src/components/searchaloneorcfile/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue index 38ac47cf7..ddae1f6b6 100644 --- a/jero-web/src/components/searchalonesplit/index.vue +++ b/jero-web/src/components/searchalonesplit/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/searchalonetext/index.vue b/jero-web/src/components/searchalonetext/index.vue index 273281bf0..a2d3fa013 100644 --- a/jero-web/src/components/searchalonetext/index.vue +++ b/jero-web/src/components/searchalonetext/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue index 5f2d5fc4f..1954acee0 100644 --- a/jero-web/src/views/dashboard/customContentList.vue +++ b/jero-web/src/views/dashboard/customContentList.vue @@ -17,8 +17,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index f1f2e44e6..541994b2e 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -40,8 +40,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 17a47a1ee..7c384187b 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -39,8 +39,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 1dbc4c4ac..41307da80 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -9,8 +9,8 @@
- {{$t('query')}} {{$t('reset')}} + {{$t('query')}}
@@ -561,6 +561,7 @@ .form-btn { .form-btn-search { + margin-left: 8px; margin-right: 10px; } } diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 74bcfe483..0ffbbeeb4 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -14,8 +14,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index 2ab6a362e..9958043f2 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -33,8 +33,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index ad0dbe1b0..c91b754a3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -35,9 +35,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} @@ -90,9 +89,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index f0b81da41..f7e13f6ec 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index bcf9093fb..3f30dc402 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -34,12 +34,12 @@ - {{$t('query')}} - {{$t('reset')}} - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 29779bb19..1ffb73b44 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -47,12 +47,12 @@ - {{$t('query')}} - {{$t('reset')}} - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 3d8924c97..cc26a0fa5 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -61,9 +61,8 @@
- {{$t('query')}} - {{$t('reset')}} - + {{$t('reset')}} + {{$t('query')}}
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 39fe20342..d8e6c8ae8 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -29,9 +29,8 @@
- {{$t('query')}} - {{$t('reset')}} - + {{$t('reset')}} + {{$t('query')}}
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index 95e9b29d8..a4ff4f8aa 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -45,15 +45,15 @@ - - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/documentTools/virtualList/components/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue index 3198cb9d6..beabfc3e7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index cad27a2b7..06ba96031 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 9fcf1bc8a..d947ca94f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -78,12 +78,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} @@ -147,7 +147,7 @@ @click="detailclick(record)">{{$t('See')}} {{$t('maintenance')}} - + {{$t('endUpgrade')}} - {{ $t('query') }} - {{ $t('reset') }} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{ $t('reset') }} + {{ $t('query') }} @@ -374,10 +374,10 @@ export default { } }) } - - } + } - + } + }, // 创建车型 createvehicleandfunctionrecords() { diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 205ff409c..4d8a7997e 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index b7aa496dd..13527dda3 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 66d960461..2b8cea82a 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -74,12 +74,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 9a806dbcd..e30099472 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 872d44561..2ffda150a 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index b10d1013b..da03e081c 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -14,8 +14,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 4a299abd8..f9fa721ef 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index 25ccd69f9..f1fda8f8b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -24,8 +24,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 5879a3959..1cf7194cd 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -68,13 +68,13 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 1371c11a3..e097b6f4b 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue index 232174545..2c77137b0 100644 --- a/jero-web/src/views/projectManagement/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/transferList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue index 556ddceeb..ea671769a 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue @@ -28,8 +28,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 486fe5b67..76c193aeb 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -136,8 +136,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 064bbf6df..a4bcebb6d 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -84,8 +84,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index ff56161e1..43395bb1d 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -45,8 +45,8 @@
- {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 6047a5216..fe8b22da4 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -102,12 +102,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index e94228121..d72393dd9 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -130,12 +130,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue index 3f5e7e577..62a7b57ce 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -80,9 +80,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index fe8ef3d12..57c25a03a 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -36,9 +36,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 46500f82b..88d5bc1be 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -52,8 +52,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 91503bbb7..0ff139f8e 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index 55514965f..f53732a59 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -16,8 +16,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index b8edf2afe..0dc986d12 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -35,9 +35,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 991784e40..96615f565 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -81,12 +81,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ toggleSearchStatus ? $t('away') : $t('open') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue index 166aba2f5..aae13301b 100644 --- a/jero-web/src/views/system/modules/DeptUserInfo.vue +++ b/jero-web/src/views/system/modules/DeptUserInfo.vue @@ -12,8 +12,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index f9f974792..6953e3448 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 6b7901469..43f97efa6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -65,12 +65,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index 7849db357..602685ad6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue index 25ccd69f9..21e1569fe 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue @@ -24,10 +24,10 @@ - {{$t('query')}} - {{$t('reset')}} - - + {{$t('reset')}} + {{$t('query')}} + + diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 44e465822..45293970d 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index bf4f2b8dc..ddc60716c 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -82,13 +82,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} From 3c6ad9619084b36f7c39010a6c763ab5faed54aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 13:40:21 +0800 Subject: [PATCH 18/21] =?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-=E5=8F=AF=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=9A=84=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8E=E5=8F=82=E6=95=B0-=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/upgradedonline.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 888fd051c..b364d98c4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -88,10 +88,10 @@ fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }}
-

注:附件包括测试项目清单、测试报告．测试标准或技术规范

-

    支持doc/docx/pdf格式,大小50M以内

+

{{ $t('note') }}

+

    {{ $t('format') }}

- +
{{$t('preservation')}} @@ -463,7 +463,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) } } From 269bdebe803120d8dc6d1fd4218a1d980c642599 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 13:44:08 +0800 Subject: [PATCH 19/21] bug 67476 --- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 7d63c299b..1c3e59dde 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -206,7 +206,7 @@ import ImportFile from '@/components/ImportFileData/index' // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz - if(res.result.zmclList){ + if(res.result.zmclList.length != 0){ this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 3e17a247a..779877220 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -228,7 +228,7 @@ export default { this.dataSource[7].relevantverification=Number(res.result.sjsbaq) this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) - if(res.result.zmclList){ + if(res.result.zmclList.length != 0){ this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList From 578a5667138bfe2fd3741034827dd7d3d4eb3eb0 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 14:15:06 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 80899ab2f..ef5d10f6f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -12,7 +12,7 @@
- +
@@ -37,11 +37,14 @@
+ * {{$t('upgraderecordnumber')}}
-
+
- + + +
@@ -60,9 +63,10 @@
+ * {{$t('Modelandfunctionrecord')}}
- + {{ item.ggpc }} @@ -174,6 +178,14 @@ import ImportFile from '@/components/ImportFileData/index' projectNameList2:[], selectListPc:[], selectListMb:[], + rules:{ + babh:[ + { required:true,message:this.$t('upgraderecordnumber')+this.$t('cannotEmpty'),trigger:'blur'} + ], + bapc:[ + { required:true,message:this.$t('Modelandfunctionrecord')+this.$t('cannotEmpty'),trigger:'change'} + ] + } } }, mounted() { @@ -230,17 +242,27 @@ import ImportFile from '@/components/ImportFileData/index' if(otaId==null){ otaId='' } - postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ + this.$refs.ruleForm.validate(valid=>{ + if(valid){ + postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) this.getData() } }) + } + }) + }, next(){ this.save() - this.$emit('basicInformationForm') + this.$refs.ruleForm.validate(valid=>{ + if(valid){ + this.$emit('basicInformationForm') + }}) + + }, getSelect(){ getAction('/ota/otaBaCxList/list').then(res=>{ @@ -368,4 +390,8 @@ import ImportFile from '@/components/ImportFileData/index' margin-top: 5px; line-height: 1.4 !important; } + .Required { + color: red; + margin-right: 3px; +} \ No newline at end of file From 4d57ad1ffbc810fb562f72bd1c0b918ae6a002d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 14:19:17 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=20OTA=E8=BD=A6=E5=9E=8B-=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB=E7=BB=9F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0-=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 2a74c0dcf..9d0fee01e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -93,7 +93,7 @@
- {{$t('fillincontent')}} + {{$t('configuration')}} {{ $t('yes') }} @@ -948,7 +948,7 @@ export default { this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) },