From 5b4054bcef3db71b99f535f1efd99732e26a1498 Mon Sep 17 00:00:00 2001 From: gaosong Date: Sun, 26 Nov 2023 14:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/enums/ProjectRoleEnum.java | 10 +++++----- .../lawsOpinionGather/enums/GatherResultEnum.java | 2 +- .../com/jero/modules/wkflow/enums/FlowTypeEnum.java | 2 +- jero-web/src/common/lang/en-us.js | 6 +++--- .../views/projectManagement/ProjectDetails/index.vue | 10 +++++----- .../platformItemLibraryDetails/index.vue | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index b4c675812..303bda11b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -7,18 +7,18 @@ import org.apache.commons.lang3.StringUtils; */ public enum ProjectRoleEnum { STUDIO_ENGINEER("studio工程师","0","R&H Studio","R&H Studio"), - REGULATI_ENGINEER("法规工程师","1","studio","Regulation"), - HOMOLOGATION_ENGINEER("认证工程师","2","homo","homo"), - REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4","Regulatory Engineer/Certification Engineer","Regulatory Engineer/Certification Engineer"), + REGULATI_ENGINEER("法规工程师","1","studio","Regulation Engineer"), + HOMOLOGATION_ENGINEER("认证工程师","2","homo","Homo Engineer"), + REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4","Regulatory Engineer/Certification Engineer","Regulation Engineer/Homo Engineer"), MANAGER("领导角色","11","R&H Manager","R&H Manager"), ADMIN("系统管理员","12","admin","admin"), VIEWER("Viewer","13","Viewer","Viewer"), BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator","BrandAdministrator"), //法规清单使用 - INTERFACE_PERSON1("工程接口人","30","Interface person","Interface person"), + INTERFACE_PERSON1("工程接口人","30","Interface person","Eng. Interface"), PERSON_LIABLE1("责任人","31","Person liable","Person liable"), // 项目库-认证清单使用。 - INTERFACE_PERSON("工程接口人","20","Interface person","Interface person"), + INTERFACE_PERSON("工程接口人","20","Interface person","Eng. Interface"), PERSON_LIABLE("责任人","21","Person liable","Person liable"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java index ef0721ab5..af48b5c33 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; */ public enum GatherResultEnum { - UNDERWAY("进行中","Underway","Underway"), + UNDERWAY("进行中","Underway","In progress"), COMPLETED("已完成","Completed","Completed"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 77c6683f8..9189e8856 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -12,7 +12,7 @@ public enum FlowTypeEnum { RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc","清单任务确认","List task confirmation"), SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性流程","Design Compliance Process"), PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc","Pre-Homo确认","Pre-Homo Confirmation"), - YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性流程","Verification Compliance Process"), + YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性流程","Validation Compliance Process"), FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Opinion Collection on Regulation"), FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory Technical Assessment"), QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Regulation List Release"), diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4a2b93eff..bfc0b4fd3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -828,7 +828,7 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Description', - WhetherMergeParameters: 'Merge Parameters?', + WhetherMergeParameters: 'Merge Parameters', merge: 'Yes', nonjoinder: 'No', MergeSeparator: 'Merge separator', @@ -1647,7 +1647,7 @@ module.exports = { afterthesoftwareversionupgraded: 'After software version number upgrade', beforetheOSversionupgraded: 'Before the operating system version number is upgraded', aftertheoperatingsystemversionupgraded: 'After the operating system version number is upgraded', - initialpackageforintegrityinflammatorydata: 'Initial package for integrity of inflammatory data', + initialpackageforintegrityinflammatorydata: 'Integrity Verification Data for the Initial Package', upgradepackageintegrityverificationdata: 'Upgrade package integrity verification data', upgradepackagesize: 'Upgrade package size (MB)', differentialupgradeornot: 'Differential upgrade or not', @@ -2032,7 +2032,7 @@ module.exports = { high: 'High', centre: 'Centre', low: 'Low', - interfacePerson: 'Interface person', + interfacePerson: 'Eng. Interface', regulationEngineerInitiateProcess: 'Regulation Engineer Initiate Process', parameterCollectionDescription:'In the extension parameter collection list, the data highlighted in red represents the deleted parameters after template update, the data highlighted in yellow represents the changed parameters after template update, and for the newly added parameters after template update, homo engineer should find in "More-Add" and add them to the parameter collection list.', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 793cd49cd..a1fd5ec66 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -293,16 +293,16 @@ export default { }, roleSwitchListEn: { '0': 'R&H Studio', - '1': 'Regulation', - '2': 'homo', - '4': 'Regulatory Engineer/Certification Engineer', + '1': 'Regulation Engineer', + '2': 'Homo Engineer', + '4': 'Regulation Engineer/Homo Engineer', '11': 'R&H Manager', '12': 'admin', '13': 'Viewer', '14': 'BrandAdministrator', - '20': 'Interface person', + '20': 'Eng. Interface', '21': 'Person liable', - '30': 'Engineering interface person', + '30': 'Eng. Interface', '31': 'Person liable' }, areaOfResponsibility: {}, diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue index 663ec2e0c..b2f8697c8 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue @@ -199,16 +199,16 @@ export default { }, roleSwitchListEn: { '0': 'R&H Studio', - '1': 'studio', - '2': 'homo', - '4': 'Regulatory Engineer/Certification Engineer', + '1': 'Studio', + '2': 'Homo Engineer', + '4': 'Regulation Engineer/Homo Engineer', '11': 'R&H Manager', '12': 'admin', '13': 'Viewer', '14': 'BrandAdministrator', - '20': 'Interface person', + '20': 'Eng. Interface', '21': 'Person liable', - '30': 'Engineering interface person', + '30': 'Eng. Interface', '31': 'Person liable' }, areaOfResponsibility: {},