diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 93e296293..80cb0a3be 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1771,6 +1771,7 @@ module.exports = { andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned', deliverablesFor:'Deliverables for', dutyPersonRejected:'Rejected by the responsible person', + acceptanceTheResponsiblePerson:'Acceptance by the responsible person', theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?', reviewTheReasonForReturn:'Review the reason for return', reasonForTaskRejection:'Reason for task rejection', @@ -2019,4 +2020,6 @@ module.exports = { Filingcompletiontime:'Filing completion time', Platformdevelopmentvalvepoint:'Platform development valve point', Compliancemanagementvalvepoint:'Compliance management valve point', + designTaskValidation:'Design task validation', + verificationTaskValidation:'Verification task validation', } \ 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 653497dc2..579f9ec35 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3778,6 +3778,7 @@ module.exports = { andPendingSubmissionReviewReturned: '并且流程状态为结果待提交、审查退回', deliverablesFor: '的交付结果', dutyPersonRejected: '责任人拒绝', + acceptanceTheResponsiblePerson:'责任人接受', theCurrentlySelectedDataContainsReviewed: '当前选择的数据中包含审查通过的数据,确认退回吗?', reviewTheReasonForReturn: '审查退回原因', reasonForTaskRejection: '任务拒绝原因', @@ -3975,4 +3976,6 @@ module.exports = { Filingcompletiontime:'备案完成时间', Platformdevelopmentvalvepoint:'平台件开发阀点', Compliancemanagementvalvepoint:'合规管理阀点', + designTaskValidation:'设计任务确认', + verificationTaskValidation:'验证任务确认', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 63246a914..ea759280f 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -71,7 +71,7 @@
RXSWIN - diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index b19a1314f..c6b4c388e 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -110,34 +110,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 }) @@ -155,22 +163,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/components/parameterCollectionProgress.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue index 3e7bd272a..2aca019fe 100644 --- a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue +++ b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue @@ -239,7 +239,7 @@ text: this.$t('parameterCollectionProgress'), }, legend: { - data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], + data: [this.$t('notLaunch'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], icon: 'circle', bottom:'0', itemWidth: 12, @@ -294,7 +294,7 @@ }, series: [ { - name: this.$t('Notatthe'), + name: this.$t('notLaunch'), type: 'bar', stack: 'one', barWidth: 40, diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index 9b6e851cd..824863613 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -1,10 +1,16 @@