diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue index a2da1a598..8eb6ebc8c 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue @@ -109,34 +109,42 @@ if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { - if (res.taskAffirmStatus == 'Not started') { + if (res.taskAffirmStatus == 'List to be released') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('notLaunch'), + name: this.$t('listToBeReleased'), color: '#00B3BE', status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'List to be checked') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('listToBeChecked'), + color: '#4B82FF', + status: res.taskAffirmStatus + }) + color.push('#4B82FF') + } else if (res.taskAffirmStatus == 'Task to be confirmed') { + data.push({ + value: res.taskAffirmStatusCount, + name: this.$t('taskToBeConfirmed'), color: '#FDA71C', status: res.taskAffirmStatus }) color.push('#FDA71C') - } else if (res.taskAffirmStatus == 'Accepted') { + } else if (res.taskAffirmStatus == 'Refusal of responsible person') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('accept'), + name: this.$t('acceptanceTheResponsiblePerson'), color: '#26BC4B', status: res.taskAffirmStatus }) color.push('#26BC4B') - } else if (res.taskAffirmStatus == 'Rejected') { + }else if (res.taskAffirmStatus == 'Accepted of responsible person') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('refuse'), + name: this.$t('dutyPersonRejected'), color: '#E83030', status: res.taskAffirmStatus }) @@ -154,22 +162,30 @@ if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { - if (res.taskAffirmStatus == 'Not started') { + if (res.taskAffirmStatus == 'Task to be confirmed') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('notLaunch'), + name: this.$t('taskToBeConfirmed'), color: '#00B3BE', status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'To submit') { + } else if (res.taskAffirmStatus == 'Results to be submitted') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('toSubmit'), + name: this.$t('resultsToBeSubmitted'), color: '#FDA71C', status: res.taskAffirmStatus }) color.push('#FDA71C') + }else if (res.taskAffirmStatus == 'Results to be reviewed') { + data.push({ + value: res.taskAffirmStatusCount, + name: this.$t('resultsToBeReviewed'), + color: '#745ADB', + status: res.taskAffirmStatus + }) + color.push('#745ADB') } else if (res.taskAffirmStatus == 'Review and pass') { data.push({ value: res.taskAffirmStatusCount, diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue index 6d1a894a1..8ad75198f 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue @@ -1,11 +1,17 @@