diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2ba995ce3..98b8dcebb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -826,4 +826,10 @@ module.exports = { refuse:'Refuse', taskTermination:'Task termination', projectStatusAndProgress:'Project status and progress', + listConfirmationProgress:'List confirmation progress', + taskConfirmationProgress:'Task confirmation progress', + designComplianceConfirmationProgress:'Design Compliance Confirmation Progress', + preHomeConfirmProgress:'Pre-Home confirm progress', + verificationComplianceConfirmationProgress:'Verification compliance confirmation progress', + totalTable:'Total', } \ 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 44034ddff..b85da3a08 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -831,4 +831,10 @@ module.exports = { refuse:'拒绝', taskTermination:'任务终止', projectStatusAndProgress:'项目状态进度', + listConfirmationProgress:'清单确认进度', + taskConfirmationProgress:'任务确认进度', + designComplianceConfirmationProgress:'设计符合性确认进度', + preHomeConfirmProgress:'Pre-Home确认进度', + verificationComplianceConfirmationProgress:'验证符合性确认进度', + totalTable:'总数', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue index 2c57f37e6..c567512c9 100644 --- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue +++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue @@ -4,7 +4,20 @@
-
+
+ + + +
@@ -15,7 +28,37 @@ export default { name: 'certificationProgress', data() { - return {} + return { + loading:false, + dataSource:[], + columns: [ + { + title: this.$t('notInvolved'), + align: 'center', + dataIndex: 'nonConformity', + }, + { + title: this.$t('toBeStarted'), + align: 'center', + dataIndex: 'Tracked', + }, + { + title: this.$t('inProgress'), + align: 'center', + dataIndex: 'accord', + }, + { + title: this.$t('experimentFailed'), + align: 'center', + dataIndex: 'notEvaluated', + }, + { + title: this.$t('experimentPassed'), + align: 'center', + dataIndex: 'notEvaluatedOne', + } + ] + } }, mounted() { this.mainLeftEcharts() @@ -59,11 +102,14 @@ }, mainLeftEcharts() { let data = [ - { value: 1048, name: '待审查' }, - { value: 735, name: '审查中' }, - { value: 580, name: '审查完成' } + { value: 1048, name: this.$t('notInvolved') }, + { value: 735, name: this.$t('toBeStarted') }, + { value: 580, name: this.$t('inProgress') }, + { value: 580, name: this.$t('experimentFailed') }, + { value: 580, name: this.$t('experimentPassed') } ] - this.getEcharts('main-left', '内部审查进度', ['#00BEBE', '#FDB033', '#2F8DF3'], data) + let color = ['#9DB9D4', '#FDB033', '#37CED1', '#FF8543', '#2F8DF3', ] + this.getEcharts('main-left', this.$t('CertificationProgress'), color, data) } } } diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue index e175f9d73..2626209ce 100644 --- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue +++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue @@ -1,5 +1,11 @@