From 6bad9e99fbc9d4f16e1172a1020474f1d8f2aeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 13:48:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB=E5=8A=A0-?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=87=AA=E5=8A=A8=E5=8C=96=E7=BA=A7=E5=88=AB?= =?UTF-8?q?-=E4=B8=8B=E6=8B=89=E9=80=89=E5=AE=8C=E6=95=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 5ac5ad696..9fe25a81e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -8,7 +8,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 330px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}" :data-source="dataSource" :loading="loading" @change="tableOnChange" diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..7afccfac2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -14,7 +14,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 140px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}" rowKey="id" bordered :data-source="dataSource" @@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ From 05b89d70ad51a812b2a375fa52194001ba556325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 13:56:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=A1=AE=E8=AE=A4=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E9=94=99=E8=AF=AF?= 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 + .../components/circulationHistory.vue | 41 ++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68eb6e659..a112514e2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -894,6 +894,7 @@ module.exports = { designComplianceReview: 'Design Compliance Confirmation', preHomeConfirmation: 'Pre-Homo Confirmation', verificationComplianceReview: 'Validation Compliance Confirmation', + verificationComplianceExamine:'Verification compliance examine', Deployment: 'Deploy', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 80aea7039..4fde5dc19 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -910,6 +910,7 @@ module.exports = { designComplianceReview: '设计符合性确认', preHomeConfirmation: 'Pre-Homo确认', verificationComplianceReview: '验证符合性确认', + verificationComplianceExamine:'验证符合性审查', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 181c85c0a..ed8dc8238 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -94,7 +94,29 @@ 'To be tracked': 'trackedClass', 'NA': 'NAClass' }, - regulatoryCertificationTaskPlanList: [ + verifyList: [ + { + status: '1', + name: this.$t('initiatingProcess') + }, + { + status: '1', + name: this.$t('Taskresponsibilityrecognition') + }, + { + status: '1', + name: this.$t('verificationComplianceReview') + }, + { + status: '2', + name: this.$t('verificationComplianceExamine') + }, + { + status: '3', + name: this.$t('missionAccomplished') + } + ], + designList: [ { status: '1', name: this.$t('initiatingProcess') @@ -116,6 +138,7 @@ name: this.$t('missionAccomplished') } ], + regulatoryCertificationTaskPlanList: [], columns: [ { title: this.$t('Operator'), @@ -168,6 +191,7 @@ } }, mounted() { + console.log(this.queryProject) this.getList() }, methods: { @@ -180,6 +204,11 @@ if (res.success) { this.dataSource = res.result || [] if (this.dataSource.length > 0) { + if (this.queryProject.flowType == 4) { + this.regulatoryCertificationTaskPlanList = this.verifyList + } else { + this.regulatoryCertificationTaskPlanList = this.designList + } let taskData = this.dataSource[this.dataSource.length - 1] if (this.queryProject.TaskKey == 'fqlc') { this.regulatoryCertificationTaskPlanList.forEach(val => { @@ -211,6 +240,8 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '2' } else { val.status = '3' } @@ -227,6 +258,10 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '1' } else { val.status = '1' } @@ -239,8 +274,12 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '2' } else { val.status = '3' } From 1182d29f76252a26523803c65e1e6c060a8f030c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 13:58:14 +0800 Subject: [PATCH 3/4] bug 67372 --- .../auxiliaryupgradehavechanged.vue | 14 +++++------ .../informationaboutotherupgradetasks.vue | 1 + .../thetargetvehicleofthisupgrade.vue | 1 + .../components/upgradehavechanged.vue | 24 +++++++++---------- .../components/upgradetargetmodel.vue | 10 ++++---- .../components/usernotification.vue | 6 +++++ .../components/basicInformation.vue | 6 +++++ .../components/beupgradedonline.vue | 14 +++++------ .../components/recordparameters.vue | 14 +++++------ .../components/upgradedonline.vue | 22 ++++++++--------- 10 files changed, 63 insertions(+), 49 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index dac7607bd..874f7835b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -23,25 +23,25 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index b538c61fc..e6ed49fe3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -13,6 +13,7 @@ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 0519e66a3..8f4b044d5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -22,6 +22,7 @@ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8199c7a35..3a72352db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -23,42 +23,42 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index fb73175b7..ab30dab77 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -41,7 +41,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@ {{$t('producttrademark')}} - + @@ -88,7 +88,7 @@ {{$t('productname')}} - + @@ -99,7 +99,7 @@ {{$t('productModel')}} - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index d0274ca19..3295454ca 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -23,6 +23,7 @@ @@ -37,6 +38,7 @@ @@ -51,6 +53,7 @@ @@ -65,6 +68,7 @@ @@ -79,6 +83,7 @@ @@ -93,6 +98,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index c70335a05..e8a778c32 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -39,6 +39,7 @@ :disabled="disabled" class="box-input" :placeholder="$t('pleaseEnter')" + :title='form.qymc' v-model="form.qymc"> @@ -55,6 +56,7 @@ @@ -88,6 +90,7 @@ @@ -104,6 +107,7 @@ @@ -120,6 +124,7 @@ @@ -137,6 +142,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..f9ccf35fd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -59,26 +59,26 @@ - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..62eddff5e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -218,7 +218,7 @@
{{$t('fillincontent')}} - +
@@ -244,22 +244,22 @@ - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 42f9581cf..2ea022b96 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -43,37 +43,37 @@ - + - + - + - + - + - + - + - + - + - + - + From 42a278d4aa643a98754a189f08de8f0a7b3034af Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 14:35:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=89=E9=A1=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..c07c1a6f0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -902,7 +902,7 @@ export default { // item=Number(item) // } // }) - this.query=res.result.bj + this.query=res.result.bj==null?{}:res.result.bj } })