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 01/10] =?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 02/10] =?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 03/10] 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 04/10] =?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 05/10] =?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() } - + }) }, From ef570e5ddd07dd068c085e6293558dfd3eac2941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 14:21:14 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 31 ++++- .../ota/controller/OtaBaSjListController.java | 12 +- .../jero/modules/ota/entity/OtaBaSjList.java | 118 ++++++++++++------ .../service/impl/OtaBaCxListServiceImpl.java | 2 +- .../service/impl/OtaBaSjJssjServiceImpl.java | 35 ++++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 1 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 2 +- 8 files changed, 145 insertions(+), 58 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 35cba9c8e..c1ff0530c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -1,6 +1,7 @@ package com.jero.modules.ota.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +9,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.service.IOtaBaCxListService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -57,9 +60,33 @@ public class OtaBaCxListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 文件名称模糊查询 + String cpdjbh = req.getParameter("cpdjbh"); + if (StringUtils.isNotBlank(cpdjbh)) { + cpdjbh = cpdjbh.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpdjbh, cpdjbh); + } + + String ggpc = req.getParameter("ggpc"); + if (StringUtils.isNotBlank(ggpc)) { + ggpc = ggpc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getGgpc, ggpc); + } + + String cpsb = req.getParameter("cpsb"); + if (StringUtils.isNotBlank(cpsb)) { + cpsb = cpsb.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpsb, cpsb); + } + + String cpmc = req.getParameter("cpmc"); + if (StringUtils.isNotBlank(cpmc)) { + cpmc = cpmc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpmc, cpmc); + } + queryWrapper.orderByDesc(OtaBaCxList::getCreateTime); IPage pageList = otaBaCxListService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index d6dff0bc6..344eafb8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -176,11 +177,12 @@ public class OtaBaSjListController extends JeroController batchRecord(@RequestParam(name = "ids", required = true) String ids, - @RequestParam(name = "bazt", required = true) String bazt, - @RequestParam(name = "batjsj", required = true) String batjsj, - @RequestParam(name = "bz", required = true) String bz, - @RequestParam(name = "cut") String cut) { + public Result batchRecord(@RequestBody JSONObject json) { + String ids = json.getString("ids"); + String bazt = json.getString("bazt"); + String batjsj = json.getString("batjsj"); + String bz = json.getString("bz"); + String cut = json.getString("cut"); otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index 73b8695d8..dc0e38564 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,105 +22,146 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_list") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_list对象", description="升级备案-升级活动备案列表") +@ApiModel(value = "ota_ba_sj_list对象", description = "升级备案-升级活动备案列表") public class OtaBaSjList implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**产品登记编号*/ - @Excel(name = "产品登记编号", width = 15) + /** + * 产品登记编号 + */ + @Excel(name = "产品登记编号", width = 15) @ApiModelProperty(value = "产品登记编号") private java.lang.String cpdjbh; - /**公告批次*/ - @Excel(name = "公告批次", width = 15) + /** + * 公告批次 + */ + @Excel(name = "公告批次", width = 15) @ApiModelProperty(value = "公告批次") private java.lang.String ggpc; - /**产品商标*/ - @Excel(name = "产品商标", width = 15) + /** + * 产品商标 + */ + @Excel(name = "产品商标", width = 15) @ApiModelProperty(value = "产品商标") private java.lang.String cpsb; - /**产品名称*/ - @Excel(name = "产品名称", width = 15) + /** + * 产品名称 + */ + @Excel(name = "产品名称", width = 15) @ApiModelProperty(value = "产品名称") private java.lang.String cpmc; - /**产品型号*/ - @Excel(name = "产品型号", width = 15) + /** + * 产品型号 + */ + @Excel(name = "产品型号", width = 15) @ApiModelProperty(value = "产品型号") private java.lang.String cpxh; - /**备案状态*/ - @Excel(name = "备案状态", width = 15) + /** + * 备案状态 + */ + @Excel(name = "备案状态", width = 15) @ApiModelProperty(value = "备案状态") + @Dict(dicCode = "recordstatus") private java.lang.String bazt; - /**备案提交时间*/ - @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 备案提交时间 + */ + @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "备案提交时间") private java.util.Date batjsj; - /**创建时间*/ - @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "创建时间") private java.util.Date cjsj; - /**备注*/ - @Excel(name = "备注", width = 15) + /** + * 备注 + */ + @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String bz; - /**升级驾驶附件*/ + /** + * 升级驾驶附件 + */ @Excel(name = "升级驾驶附件", width = 15) @ApiModelProperty(value = "升级驾驶附件") private java.lang.String sjjsfj; + /** + * 升级状态(0:升级中;1:升级结束) + */ + @Excel(name = "升级状态", width = 15) + @ApiModelProperty(value = "升级状态") + private java.lang.String sjzt; public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { this.cpdjbh = otaBaSjSjmbcx.getBabh(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 130bdb9b5..f32cfaf19 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -9,8 +9,8 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; -import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java index 73a45b937..ea06cd006 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java @@ -2,19 +2,18 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.AttachmentEO; -import com.jero.modules.ota.entity.OtaBaCxAqcs; -import com.jero.modules.ota.entity.OtaBaSjJssj; -import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.jero.modules.ota.entity.*; import com.jero.modules.ota.mapper.OtaBaSjJssjMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjJssjService; import com.jero.modules.ota.service.IOtaBaSjJssjyyService; +import com.jero.modules.ota.service.IOtaBaSjListService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Date; @@ -32,6 +31,8 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl yyList = new ArrayList<>(); + for (OtaBaSjJssjyy yy : otaBaSjJssj.getList()) { + yy.setOtaId(otaBaSjJssj.getOtaId()); + yyList.add(yy); + } + otaBaSjJssjyyService.saveBatch(yyList); + } } /** @@ -111,9 +125,10 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjJssj::getOtaId, otaId); OtaBaSjJssj res = this.getOne(queryWrapper, false); - - List list = otaBaSjJssjyyService.queryByOtaId(otaId); - res.setList(list); + if (ObjectUtils.isNotEmpty(res)) { + List list = otaBaSjJssjyyService.queryByOtaId(otaId); + res.setList(list); + } return res; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 6891f3cbb..5686e1c91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -78,6 +78,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl(); } ComparisonUtil cu = new ComparisonUtil(); - List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.SJKZQMC.getName(), oldList, newList, sysDictService); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 4abaa3d70..441ad993d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -59,7 +59,7 @@ public class ComparisonUtil { tableField.setAccessible(true); String tableFieldStr = "空"; Object tableFieldObj = tableField.get(newObj); - if (ObjectUtils.isNotEmpty(tableFieldStr)) { + if (ObjectUtils.isNotEmpty(tableFieldObj)) { tableFieldStr = tableFieldObj.toString(); } String content = "新增了一条'" + tableFieldStr + "'"; From 462b0b8f83ef853feb481ec315bd7f2eddb09f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 14:22:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/ota/utils/ComparisonUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 441ad993d..257d5b1a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -77,7 +77,7 @@ public class ComparisonUtil { String newStr = ""; if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { newStr = parseDictText(ote, field, newObj, sysDictService); - content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; + content = tableFieldStr + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } From 387c4e036ea200827271f0a7e7ff362c3e04d541 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 14:22:50 +0800 Subject: [PATCH 08/10] =?UTF-8?q?ota=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= 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 + jero-web/src/components/uploadFile/file.vue | 11 ++++++++++- .../components/auxiliaryupgradehavechanged.vue | 2 +- .../components/thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradeimpactassessment.vue | 2 +- .../components/usernotification.vue | 2 +- .../components/beupgradedonline.vue | 2 +- .../components/safetyPrecautions.vue | 2 +- .../components/upgradeRequirements.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 2 +- 11 files changed, 20 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6307e5a29..4f0c90365 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,4 +1739,5 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', + uploadedfilelarger:'The uploaded file is larger than 50 MB', } \ 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 52bc1eeed..aaa978cf2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1841,4 +1841,5 @@ module.exports = { verifyConformanceConfirmation:'验证符合性确认', designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', + uploadedfilelarger:'文件大于50M', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 457ab1346..747211830 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl','acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled', 'thisFileUploadUrl','size' ,'acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -98,6 +98,15 @@ return false } } + // 根据大小拦截 + if(this.size){ + const isLt2KB = file.size / 1024 /1024 < this.size + let name = file.name + if (!isLt2KB) { + this.$message.error(name + this.$t('uploadedfilelarger')) + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 68c4443a4..a3b7a1546 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -68,7 +68,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 2215482c4..67b396f2d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -83,7 +83,7 @@ }}

{{$t('noteone')}}

- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5e791007d..e7ec6ed0c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -162,7 +162,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 10413d2a0..79f27f620 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -182,7 +182,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index df3be5491..57d84655e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -103,7 +103,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 1c3e59dde..54953b5d8 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -47,7 +47,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 779877220..70cdeba6a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -34,7 +34,7 @@ {{ $t('last') }} {{ $t('next') }} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index b364d98c4..53849ae28 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -99,7 +99,7 @@ {{$t('next')}} - + From 8515c72396e9a49f18113d57a71d7ab0dd0ee023 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 14:27:30 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index ef5d10f6f..591c724e9 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -244,6 +244,11 @@ import ImportFile from '@/components/ImportFileData/index' } this.$refs.ruleForm.validate(valid=>{ if(valid){ + this.selectListPc.map(item=>{ + if(item.id==this.form.bapc){ + this.form.bapc=item.ggpc + } + }) postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) From 6208f593210a854409f42b988961fb93e03c3085 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 14:42:14 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index d947ca94f..dfaff90fc 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')}}