diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index 5ed0f37a3..7bf8c464a 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -333,10 +333,10 @@ data.push({ value: res.designFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.designFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.designFlowTaskStatus == 'Compliance') { data.push({ value: res.designFlowTaskStatusCount, @@ -395,10 +395,10 @@ data.push({ value: res.verifyFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.verifyFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.verifyFlowTaskStatus == 'Compliance') { data.push({ value: res.verifyFlowTaskStatusCount, diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue index da30c6bfc..9d55f10e1 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue @@ -335,10 +335,10 @@ data.push({ value: res.designFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.designFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.designFlowTaskStatus == 'Compliance') { data.push({ value: res.designFlowTaskStatusCount, @@ -397,10 +397,10 @@ data.push({ value: res.verifyFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.verifyFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.verifyFlowTaskStatus == 'Compliance') { data.push({ value: res.verifyFlowTaskStatusCount, diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue index 0a1fa65a6..279ba8109 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue @@ -473,10 +473,10 @@ data.push({ value: res.designFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.designFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.designFlowTaskStatus == 'Compliance') { data.push({ value: res.designFlowTaskStatusCount, @@ -535,10 +535,10 @@ data.push({ value: res.verifyFlowTaskStatusCount, name: this.$t('toBeTracked'), - color: '#FD9F48', + color: '#FFFF00', status: res.verifyFlowTaskStatus }) - color.push('#FD9F48') + color.push('#FFFF00') } else if (res.verifyFlowTaskStatus == 'Compliance') { data.push({ value: res.verifyFlowTaskStatusCount, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index a5623af7c..ac852e480 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -221,10 +221,6 @@ title: this.$t('personLiable'), value: this.queryData.personLiable }, - { - title: this.$t('deliveryDate'), - value: this.queryData.DueDate - }, { title: this.$t('statisticalNodes'), value: 'dutyDepart' @@ -237,6 +233,10 @@ title: this.$t('typeOfDeliverables'), value: this.queryData.typeOfDeliverables }, + { + title: this.$t('deliveryDate'), + value: this.queryData.DueDate + }, { title: this.$t('deliverableTemplate'), value: this.queryData.deliverableTemplate,