diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java index 3bc88251f..4f4b9b081 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java @@ -75,7 +75,7 @@ public class CertCategoryParamsInfoEO implements Serializable { private String description; /**nio编号*/ - @Excel(name = "*参数编号", width = 15, orderNum = "1") + @Excel(name = "*NIO编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index d28b0bc1b..1df1f9a2e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -62,7 +62,7 @@ public class ParamsInfoEO implements Serializable { private String sysOrgCode; /**nio编号*/ - @Excel(name = "*参数编号", width = 15) + @Excel(name = "*NIO编号", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 41b82d5a9..f41bf40a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -104,9 +104,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("参数编号已存在!"); + throw new JeroBootException("NIO编号已存在!"); } else { - throw new JeroBootException("Parameter number already exists!"); + throw new JeroBootException("NIO number already exists!"); } } @@ -182,9 +182,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("参数编号已存在!"); + throw new JeroBootException("NIO编号已存在!"); } else { - throw new JeroBootException("Parameter number already exists!"); + throw new JeroBootException("NIO number already exists!"); } } } @@ -451,16 +451,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { - String fields[] ={ "*参数编号", "*是否必填", "*参数名称","*参数批次","*责任领域", + String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域", "参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"}; params.setImportFields(fields); @@ -952,14 +952,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*Parameter Number", "*Number", "*Para Name","Description"}; + String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); List listEn = resultEn.getList(); copycertCategoryParamsInfoList(listEn, list); } else { - String fields[] ={ "*参数编号", "*编号", "*参数名称","参数说明"}; + String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"}; params.setImportFields(fields); ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); @@ -1227,7 +1227,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "参数编号", "Parameter Number", IsMustEnum.YES.getValue(),"20", false, cut); + resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"20", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { @@ -1235,18 +1235,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl - 全球法规平台 + 蔚来全球法规平台 diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b38fabe8f..3e2b9e7ca 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -638,7 +638,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'Parameter Number',//NIO Number + NiONumber: 'NIO Number', ParameterName: 'Parameter Name', ParameterDescription: 'Parameter Description', Version: 'Version', @@ -736,7 +736,7 @@ module.exports = { // 认证 // 认证状态 timeOperation: 'You have permission to operate this button.', - NiOnumberis: 'Parameter Number is',//NiO number is + NiOnumberis: 'NiO number is', NoOperationPermissionForthisbutton: 'No Operation permission for this button', Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ', Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', @@ -807,7 +807,7 @@ module.exports = { templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', - NiOnumberalreadyexists: 'Parameter Number already exists, please replace parameter number',//NiO number already exists, please replace NiO number + NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', attachmentTemplate: 'Attachment Template', controlAlternatives: 'Control Component', controlVerification: 'Validate Component', @@ -1024,8 +1024,8 @@ module.exports = { implementationModel: 'Implementation Model', primaryCoverageCn: 'Description (Cn)', primaryCoverageEn: 'Description (En)', - workProgressCn: 'Work Progress (Cn)',//NIO Work Progress (Cn) - workProgressEn: 'Work Progress (En)',//NIO Work Progress (En) + workProgressCn: 'NIO Work Progress (Cn)', + workProgressEn: 'NIO Work Progress (En)', initiatingProcess: 'Initiate Process', collectResults: 'Collect Results', dateOfInitiation: 'Date Of Initiation', @@ -1061,8 +1061,8 @@ module.exports = { Synchronizedatabase: 'Synchronize the data of the selected row to the database?', Aftersynchronization: 'After synchronization, the parameter items cannot be modified.', FNumber: 'Number', - NNNiONumber: 'Parameter Number', - NNiONumber: 'Parameter Number',//NIO Number + NNNiONumber: 'Number', + NNiONumber: 'NIO Number', ParameterNo: 'Number', NRequired: 'Required', NParameterName: 'Para Name', @@ -1099,7 +1099,7 @@ module.exports = { yes: 'Yes', Copyparameterlist: 'Copy Parameter List', Templatenamelist: 'Template name - parameter item collection list', - newNiONumber: 'Parameter Number', + newNiONumber: 'Number', English: 'English', requiredParametersEmpty: 'Required parameters cannot be empty', PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', @@ -1278,7 +1278,7 @@ module.exports = { pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', - weilaiRegulationMonthlyReport:'Regulation Monthly Report',//Weilai + weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed', thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', industryInformationDynamicTemplate:'Industry information dynamic template', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 52db0d11f..bf6a67de7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -648,7 +648,7 @@ module.exports = { TaskRequirements: '任务要求', CertificationProgress: '认证进度', CurrentProjectStatusEvaluation: '当前项目状态评估', - NiONumber: '参数编号',//NIO编号 + NiONumber: 'NIO编号', ParameterName: '参数名称', ParameterDescription: '参数说明', Version: '版本', @@ -752,7 +752,7 @@ module.exports = { // 认证 // 认证状态 timeoperation: '时,才有权限操作此按钮。', - NiOnumberis: '参数编号为',//NIO编号为 + NiOnumberis: 'NIO编号为', NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注:冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', @@ -823,7 +823,7 @@ module.exports = { templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', - NiOnumberalreadyexists: '参数编号已存在,请更换参数编号',//NIO编号已存在,请更换NIO编号 + NiOnumberalreadyexists: 'NIO编号已存在,请更换NIO编号', attachmentTemplate: '附件模板', controlAlternatives: '控件备选值', controlVerification: '控件校验', @@ -1034,8 +1034,8 @@ module.exports = { implementationModel: '实施车型', primaryCoverageCn: '主要内容(中文)', primaryCoverageEn: '主要内容(英文)', - workProgressCn: '工作进展(中文)',//NIO工作进展(中文) - workProgressEn: '工作进展(英文)',//NIO工作进展(英文) + workProgressCn: 'NIO工作进展(中文)', + workProgressEn: 'NIO工作进展(英文)', initiatingProcess: '发起流程', collectResults: '收集结果', dateOfInitiation: '发起日期', @@ -1072,8 +1072,8 @@ module.exports = { Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改', FNumber: '账号', - NNNiONumber: '参数编号',//NIO编号 - NNiONumber: '参数编号',//NIO编号 + NNNiONumber: 'NIO编号', + NNiONumber: 'NIO编号', ParameterNo: '编号', NRequired: '是否必填', NParameterName: '参数名称', @@ -1109,7 +1109,7 @@ module.exports = { NFourDecimalplaces: '四位小数', Copyparameterlist: '复制参数清单', Templatenamelist: '模板名称-参数项收集清单', - newNiONumber: '参数编号',//NIO编号 + newNiONumber: 'NIO编号', English: '英文', requiredParametersEmpty: '必填参数不能为空', theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空', @@ -1380,7 +1380,7 @@ module.exports = { pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', - weilaiRegulationMonthlyReport:'法规月报',//蔚来 + weilaiRegulationMonthlyReport:'蔚来法规月报', onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'只能变更清单确认状态为接受并且任务清单状态为未发起或任务清单状态为接受的数据', thereTitleWhichCannotBeDeleted: '该标题下存在新增内容,不能删除', industryInformationDynamicTemplate: '行业资讯动态模板', diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 735dec841..0e780947d 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -41,7 +41,7 @@ this.$route.meta.title === ' Home Page') { this.Navigation = this.$route.meta.title this.subNavigation = null - let projectTitle = '全球法规平台' + let projectTitle = '蔚来全球法规平台' document.title = projectTitle } else { this.updateMenu() @@ -49,7 +49,7 @@ }, methods: { updateMenu() { - let projectTitle = '全球法规平台' + let projectTitle = '蔚来全球法规平台' const routes = this.$route.matched.concat() const { hidden } = this.$route.meta if (routes.length >= 3 && hidden) { diff --git a/jero-web/src/components/tools/Logo.vue b/jero-web/src/components/tools/Logo.vue index 00c56fbec..42ec433a4 100644 --- a/jero-web/src/components/tools/Logo.vue +++ b/jero-web/src/components/tools/Logo.vue @@ -1,13 +1,13 @@