From f431f39e1b3c920183f7eb5f68abe5b31b5ee780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 25 Apr 2023 15:13:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/regulatoryCompliance.vue | 158 +- .../projectStatusBoard/index.vue | 1443 +++++++++-------- 4 files changed, 901 insertions(+), 706 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2924c0d11..b3fe193f8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1813,4 +1813,7 @@ module.exports = { certificationActivityManagement:'Certification Activity Management', parameterCollectionProgressManagement:'Parameter Collection Progress Management', certificationTaskConfirmation:'Certification Task Confirmation', + selectTime:'Select Time', + designCompliance:'Design Compliance', + verifyCompliance:'Verify Compliance', } \ 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 d74c33f43..985db1858 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1915,4 +1915,7 @@ module.exports = { certificationActivityManagement:'认证活动管理', parameterCollectionProgressManagement:'参数收集进度管理', certificationTaskConfirmation:'认证任务确认', + selectTime:'选择时间', + designCompliance:'设计符合性', + verifyCompliance:'验证符合性', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index 37105b821..ea81954a7 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -36,7 +36,6 @@ data() { return { loading: false, - currentProjectStatusTotal: 0, url: { getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics' }, @@ -82,9 +81,12 @@ getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => { if (res.success) { if (res.result) { - let dataSource = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusMapList : [] - this.mainLeftEcharts(dataSource) - this.currentProjectStatusTotal = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusTotal : 0 + let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : [] + let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : [] + let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : [] + this.mainTopEcharts(mainTopDataSource) + this.mainLeftEcharts(mainLeftDataSource) + this.mainRightEcharts(mainRightDataSource) } } }) @@ -124,61 +126,137 @@ } ] }) - myChart.on('click', (params) => { - let query = { - title: params.seriesName, - projectLibraryId: this.$route.query.id, - operatorType: 'queryCurrentProjectStatusStatistics', - conditionAssessment: params.data.color - } - this.$refs.responsibilityListRef.getData(query) - }) + // myChart.on('click', (params) => { + // let query = { + // title: params.seriesName, + // projectLibraryId: this.$route.query.id, + // operatorType: 'queryCurrentProjectStatusStatistics', + // conditionAssessment: params.data.color + // } + // this.$refs.responsibilityListRef.getData(query) + // }) }, - mainLeftEcharts(dataSource) { + + mainTopEcharts(dataSource) { let data = [] let color = [] if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { - if (res.color == '4') { + if (res.taskAffirmStatus == 'Not started') { data.push({ - value: res.conditionAssessmentCount, - name: this.$t('blue'), - color: res.color + value: res.taskAffirmStatusCount, + name: this.$t('notLaunch'), + color: '#00B3BE' }) color.push('#00B3BE') - this.dataSource[0].blueCount = res.conditionAssessmentCount - } else if (res.color == '1') { + } else if (res.taskAffirmStatus == 'List to confirm') { data.push({ - value: res.conditionAssessmentCount, - name: this.$t('red'), - color: res.color - }) - color.push('#E83030') - this.dataSource[0].redCount = res.conditionAssessmentCount - } else if (res.color == '2') { - data.push({ - value: res.conditionAssessmentCount, - name: this.$t('yellow'), - color: res.color + value: res.taskAffirmStatusCount, + name: this.$t('listToConfirm'), + color: '#FDA71C' }) color.push('#FDA71C') - this.dataSource[0].yellowCount = res.conditionAssessmentCount - } else if (res.color == '3') { + } else if (res.taskAffirmStatus == 'Accepted') { data.push({ - value: res.conditionAssessmentCount, - name: this.$t('green'), - color: res.color + value: res.taskAffirmStatusCount, + name: this.$t('accept'), + color: '#26BC4B' }) - this.dataSource[0].greenCount = res.conditionAssessmentCount - color.push('#26BD4B') + color.push('#26BC4B') + } else if (res.taskAffirmStatus == 'Rejected') { + data.push({ + value: res.taskAffirmStatusCount, + name: this.$t('refuse'), + color: '#E83030' + }) + color.push('#E83030') } }) } - this.getEcharts('main-left', this.$t('regulatoryTaskConfirmation'), color, data) - this.getEcharts('main-right', this.$t('regulatoryTaskConfirmation'), color, data) this.getEcharts('main-top', this.$t('regulatoryTaskConfirmation'), color, data) }, + + mainLeftEcharts(dataSource){ + let data = [] + let color = [] + if (dataSource && dataSource.length > 0) { + this.dataSource = [{}] + dataSource.forEach(res => { + if (res.designFlowTaskStatus == 'Not started') { + data.push({ + value: res.designFlowTaskStatusCount, + name: this.$t('notLaunch'), + color: '#00B3BE' + }) + color.push('#00B3BE') + } else if (res.designFlowTaskStatus == 'List to confirm') { + data.push({ + value: res.designFlowTaskStatusCount, + name: this.$t('listToConfirm'), + color: '#FDA71C' + }) + color.push('#FDA71C') + } else if (res.designFlowTaskStatus == 'Compliance') { + data.push({ + value: res.designFlowTaskStatusCount, + name: this.$t('compliance'), + color: '#26BC4B' + }) + color.push('#26BC4B') + } else if (res.designFlowTaskStatus == 'Non-Compliance') { + data.push({ + value: res.designFlowTaskStatusCount, + name: this.$t('nonCompliance'), + color: '#707486' + }) + color.push('#707486') + } + }) + } + this.getEcharts('main-left', this.$t('designCompliance'), color, data) + }, + + mainRightEcharts(dataSource){ + let data = [] + let color = [] + if (dataSource && dataSource.length > 0) { + this.dataSource = [{}] + dataSource.forEach(res => { + if (res.verifyFlowTaskStatus == 'Not started') { + data.push({ + value: res.verifyFlowTaskStatusCount, + name: this.$t('notLaunch'), + color: '#00B3BE' + }) + color.push('#00B3BE') + } else if (res.verifyFlowTaskStatus == 'List to confirm') { + data.push({ + value: res.verifyFlowTaskStatusCount, + name: this.$t('listToConfirm'), + color: '#FDA71C' + }) + color.push('#FDA71C') + } else if (res.verifyFlowTaskStatus == 'Compliance') { + data.push({ + value: res.verifyFlowTaskStatusCount, + name: this.$t('compliance'), + color: '#26BC4B' + }) + color.push('#26BC4B') + } else if (res.verifyFlowTaskStatus == 'Non-Compliance') { + data.push({ + value: res.verifyFlowTaskStatusCount, + name: this.$t('nonCompliance'), + color: '#707486' + }) + color.push('#707486') + } + }) + } + this.getEcharts('main-right', this.$t('verifyCompliance'), color, data) + }, + responsibility(item) { this.$emit('currentStatus', item) } diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 735cfdab6..6568074ac 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -3,7 +3,7 @@
- +
{{ $t('entryName') }} @@ -12,7 +12,7 @@ v-model="queryParam.projectName">
- +
{{ $t('targetMarket') }} @@ -20,10 +20,10 @@ + :triggerChange="false" :dictCode="'region'"/>
- +
{{ $t('brand') }} @@ -31,11 +31,35 @@ + :triggerChange="false" :dictCode="'brand'"/> +
+ + +
+
+ {{ $t('selectTime') }} +
+ +
+
+ {{ $t('determine') }} +
+
+
- + {{ $t('reset') }} {{ $t('query') }} @@ -45,25 +69,10 @@
- {{ $t('regulatoryCertificationTaskPlan') }} - {{ $t('fullScreenView') }} + + - -
-
- {{ $t('determine') }} -
-
- +
@@ -90,21 +99,42 @@
+
-
{{ val.name }}
-
{{ val.name }} +
{{ val.name }}
+ + + + + + + + + + +
+
+ +
{{ val.name }}
- - - @@ -121,665 +151,746 @@ {{ this.$t('dataLoading') }}
-
- {{ $t('projectStatusAndProgress') }} - {{ $t('fullScreenView') }} -
- - - {{ this.$t('CurrentStatusOfTheProject') }}
- {{ '(' + $t('red') + '/' + $t('yellow') + '/' + $t('green') + '/' + $t('blue') + ')' }} - - - {{ this.$t('CertificationProgress') }}
- {{ '(' + $t('notInvolved') + '/' + $t('toBeStarted') + '/' + $t('inProgress') + '/' + $t('experimentFailed') + '/' + $t('experimentPassed') + ')' - }} - - - {{ this.$t('listConfirmation') }}
- {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' - }} - - - {{ this.$t('taskAffirm') }}
- {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' - }} - - - {{ this.$t('designComplianceReview') }}
- {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' - }} - - - {{ this.$t('preHomeConfirmation') }}
- {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' - }} - - - {{ this.$t('verificationComplianceReview') }}
- {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' - }} - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file