From c772cf3f55fb6384bac213a91f2d3f79adfc273a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 9 May 2023 15:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 16 +- .../parameterCollectionProgress.vue | 8 +- .../components/statistics.vue | 1064 +++++++++++++++++ .../projectStatusBoard/index.vue | 18 +- 4 files changed, 1091 insertions(+), 15 deletions(-) create mode 100644 jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5afe49be1..a887cd5d6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -735,7 +735,7 @@ module.exports = { regulatoryTaskConfirmation: 'Regulation Task Confirmed ', certificationStart: 'Homo Completed ', preHomoCompletion: 'Pre-Homo Completed ', - certificationEnd: 'Homo Approved ', + certificationEnd: 'Homo KO', directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', @@ -1447,12 +1447,12 @@ module.exports = { select:'select', onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted', complianceCertificationProgram:'Compliance & Homologation Program', - listPublishing:'List Release', - responsibilityConfirmation:'Responsibility Confirm', - designVerification:'Design Check', - getStarted:'Pre-Homo Starts', - certificationStartOne:'Homo Starts', - verificationAndVerification:'Validation Check', + listPublishing:'List Publishing', + responsibilityConfirmation:'Responsibility Confirmation', + designVerification:'Design Verification', + getStarted:'Get Started', + certificationStartOne:'Certification Start', + verificationAndVerification:'Verification And Verification', projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting', projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting', registrationnumber:'Product registration number', @@ -1705,7 +1705,7 @@ module.exports = { softwareversion:'Software version', returntofill:'Return to fill', thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now', - certificationSubmission:'Application Submitted', + certificationSubmission:'Certification Submission', upgradecompletion:'Upgrade completion', implementedupgrade:'Whether the implemented upgrade is consistent with the record', numberofvehicles:'Number of vehicles that have completed upgrades', diff --git a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue index 668bb5a60..e29c07668 100644 --- a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue +++ b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue @@ -111,12 +111,11 @@ this.syncReport = res.result.syncReport ? res.result.syncReport : [] this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : [] this.getEcharts() - } - } }) }, + getoptions() { let id = '' if (this.idList && this.idList.length > 0) { @@ -134,6 +133,7 @@ } }) }, + getonChange(value) { this.collectingpercentage = [] this.collectingquantity = [] @@ -145,6 +145,7 @@ this.syncReportquantity = [] this.getData(value) }, + onChange(value) { this.collectingpercentage = [] this.collectingquantity = [] @@ -155,8 +156,8 @@ this.syncReportpercentage = [] this.syncReportquantity = [] this.getEcharts() - }, + getEcharts(chart, title, color, data, num) { this.collecting.forEach((item, index) => { this.collectingpercentage.push(item.percentage) @@ -342,6 +343,7 @@ option && myChart.setOption(option, true) }, + mainLeftEcharts(data, color) { this.getEcharts('main-left', this.$t('Parametercollection'), color, data, 1) }, diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue new file mode 100644 index 000000000..63a565a4d --- /dev/null +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue @@ -0,0 +1,1064 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 69e572ba4..06347e35b 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -133,12 +133,14 @@ - - - + @@ -206,11 +208,13 @@ +