diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index f77224154..529525ec7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5621,6 +5621,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl
-
-
-
- -
{{item.iconName}}
-
+
+
+ +
{{item.iconName}}
-
+
{{$t('custom')}}
+
+
\ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 66adb0a07..c01ff108f 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -373,6 +373,22 @@
+ + +
+
+ {{$t('descriptionDeliverables')}} +
+ + + +
+
+
 {{$t('PrehomoConfirmation')}}
@@ -456,6 +472,22 @@
+ + +
+
+ {{$t('descriptionDeliverables')}} +
+ + + +
+
+
 {{$t('verificationAndConformityconfirmation')}}
@@ -538,6 +570,22 @@
+ + +
+
+ {{$t('descriptionDeliverables')}} +
+ + + +
+
+
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 464eca645..4360d9c48 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -424,7 +424,6 @@ { title: this.$t('confirmationOfDesignConformity'), - width: 540, children: [ { // TODO 未按要求实现,该列分为上下行,上行显示交付物类型,下行显示交付物模板名称,且交付物模板名称点击可下载。其他2个流程同理 @@ -448,12 +447,18 @@ width: 180, ellipsis: true, align: 'center' + }, + { + title: this.$t('descriptionDeliverables'), + dataIndex: 'designRemark', + align: 'center', + width: 220, + ellipsis: true } ] }, { title: this.$t('PrehomoConfirmation'), - width: 540, children: [ { title: this.$t('Deliverables'), @@ -476,12 +481,18 @@ width: 180, ellipsis: true, align: 'center' + }, + { + title: this.$t('descriptionDeliverables'), + dataIndex: 'prehomoRemark', + align: 'center', + width: 220, + ellipsis: true } ] }, { title: this.$t('verificationAndConformityconfirmation'), - width: 540, children: [ { title: this.$t('Deliverables'), @@ -504,6 +515,13 @@ width: 180, align: 'center', ellipsis: true + }, + { + title: this.$t('descriptionDeliverables'), + dataIndex: 'verifyRemark', + align: 'center', + width: 220, + ellipsis: true } ] }, diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue index 70ddc668d..f52b7cc03 100644 --- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue +++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue @@ -102,7 +102,7 @@ name: this.$t('notInvolved'), status: res.certificationProgress }) - color.push('#9DB9D4') + color.push('#707486') this.dataSource[0].notInvolved = res.certificationProgressCount } else if (res.certificationProgress == 'Not start') { data.push({ @@ -110,7 +110,7 @@ name: this.$t('toBeStarted'), status: res.certificationProgress }) - color.push('#FDB033') + color.push('#00B3BE') this.dataSource[0].toBeStarted = res.certificationProgressCount } else if (res.certificationProgress == 'In progress') { data.push({ @@ -118,7 +118,7 @@ name: this.$t('inProgress'), status: res.certificationProgress }) - color.push('#FF8543') + color.push('#FDA71C') this.dataSource[0].inProgress = res.certificationProgressCount } else if (res.certificationProgress == 'Test failed') { data.push({ @@ -134,7 +134,7 @@ name: this.$t('experimentPassed'), status: res.certificationProgress }) - color.push('#2F8DF3') + color.push('#26BD4B') this.dataSource[0].experimentPassed = res.certificationProgressCount } }) diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue index 31a91e2a7..03fdd8c9e 100644 --- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue +++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue @@ -124,35 +124,35 @@ name: this.$t('toBeConfirmed'), status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus }) - color.push('#37CED1') + color.push('#00B3BE') } else if (res.designFlowTaskStatus == 'Compliance' || res.prehomoFlowTaskStatus == 'Compliance' || res.verifyFlowTaskStatus == 'Compliance') { data.push({ value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount, name: this.$t('accord'), status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus }) - color.push('#2F8DF3') + color.push('#26BD4B') } else if (res.designFlowTaskStatus == 'Non-Compliance' || res.prehomoFlowTaskStatus == 'Non-Compliance' || res.verifyFlowTaskStatus == 'Non-Compliance') { data.push({ value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount, name: this.$t('nonConformity'), status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus }) - color.push('#FF8543') + color.push('#E83030') } else if (res.designFlowTaskStatus == 'To be tracked' || res.prehomoFlowTaskStatus == 'To be tracked' || res.verifyFlowTaskStatus == 'To be tracked') { data.push({ value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount, name: this.$t('Tracked'), status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus }) - color.push('#FDB033') + color.push('#FDA71C') } else if (res.designFlowTaskStatus == 'NA' || res.prehomoFlowTaskStatus == 'NA' || res.verifyFlowTaskStatus == 'NA') { data.push({ value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount, name: this.$t('notInvolved'), status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus }) - color.push('#9DB9D4') + color.push('#707486') } else if (res.designFlowTaskStatus == 'Termination of task' || res.prehomoFlowTaskStatus == 'Termination of task' || res.verifyFlowTaskStatus == 'Termination of task') { data.push({ value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,