WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"

Browse Source 
这将还原提交 0fc81dd9fa
This commit is contained in:
高嵩
2023-02-03 15:19:11 +08:00
parent 0fc81dd9fa
commit 666bcc10ff
15 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java
+1 -1
View File
@@ -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;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+1 -1
View File
@@ -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;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+31 -31
View File
@@ -104,9 +104,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
if (!nioNumber.matches(nioNumberRegex)) {
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
throw new JeroBootException("参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
} else {
throw new JeroBootException("Parameter number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
}
}
@@ -116,9 +116,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<ParamsInfoEO> 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<ParamsInfoEOMapper, Par
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
if (!nioNumber.matches(nioNumberRegex)) {
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
throw new JeroBootException("参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
} else {
throw new JeroBootException("Parameter number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
}
}
@@ -196,9 +196,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<ParamsInfoEO> 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<ParamsInfoEOMapper, Par
explanation = "Filling explanation\n"
+ "1.Import data starts at the third line, the first line is the header, the second line is the description, and the third line is the official data\n"
+ "2.All fields marked with * must be filled in\n"
+ "3.Parameter Number,Para Name,Description,Control Values,Default Value fields are text type. Enter the text content\n"
+ "3.NIO Number,Params Name,Description,Control Values,Default Value fields are text type. Enter the text content\n"
+ "4.Is Must,Params Batch,Duty Territory,Control Type,Control Verify fields are single type,Must match the corresponding field option in the system\n"
+ "5.File Template fields are file type, must create a folder in the directory of the same level as the file with the name of the params number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n";
+ "5.File Template fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n";
} else {
explanation = "填写说明\n"
+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n"
+ "2.所有带*号的字段必须填写\n"
+ "3.参数编号,参数名称,参数说明,控件备选值,默认值字段为文本,填写文本内容\n"
+ "3.NIO编号,参数名称,参数说明,控件备选值,默认值字段为文本,填写文本内容\n"
+ "4.是否必填,参数批次,责任领域,控件类型，控件校验字段为单选属性,必须和系统中的对应字段选项相匹配\n"
+ "5.附件模板为文件属性,填写时需要在本文件同级目录下以参数编号为名称建立文件夹,并在文件夹下放置文件,假设在A编号下放置了B.pdf,则应填写A/B.pdf\n";
+ "5.附件模板为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件,假设在A编号下放置了B.pdf,则应填写A/B.pdf\n";
}
} else { // 认证类别表
@@ -471,12 +471,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
explanation = "Filling explanation\n"
+ "1.Import data starts at the third line, the first line is the header, the second line is the description, and the third line is the official data\n"
+ "2.All fields marked with * must be filled in\n"
+ "3.Parameter Number,Number,Para Name,Description fields are text type. Enter the text content\n";
+ "3.NIO Number,Number,Params Name,Description fields are text type. Enter the text content\n";
} else {
explanation = "填写说明\n"
+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n"
+ "2.所有带*号的字段必须填写\n"
+ "3.参数编号,编号,参数名称,参数说明字段为文本,填写文本内容\n";
+ "3.NIO编号,编号,参数名称,参数说明字段为文本,填写文本内容\n";
}
}
@@ -932,7 +932,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 第几个sheet页
if (numSheet == 0) { // 企业参数表
if (CutEnum.EN.getValue().equals(cut)) {
String fields[] ={ "*Parameter Number", "*Required", "*Para Name","*Para Batch","*Responsible Field",
String fields[] ={ "*NIO Number", "*Required", "*Para Name","*Para Batch","*Responsible Field",
"Description", "*Control Component", "Validate Component", "Component Value", "Default Value", "File Template"};
params.setImportFields(fields);
@@ -940,7 +940,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
} else {
String fields[] ={ "*参数编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
"参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"};
params.setImportFields(fields);
@@ -952,14 +952,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (certCategoryMap.containsKey(sheetName)) {
List<CertCategoryParamsInfoCnImport> 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<CertCategoryParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params);
List<CertCategoryParamsInfoEnImport> listEn = resultEn.getList();
copycertCategoryParamsInfoList(listEn, list);
} else {
String fields[] ={ "*参数编号", "*编号", "*参数名称","参数说明"};
String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"};
params.setImportFields(fields);
ExcelImportResult<CertCategoryParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params);
@@ -1227,7 +1227,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
Map<String, Object> 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<ParamsInfoEOMapper, Par
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
if (!nioNumber.matches(nioNumberRegex)) {
if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += "参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
} else {
errorMsg += "Parameter number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
}
countError++;
}
if (CollectionUtil.isNotEmpty(nioNumberImport)) {
if (nioNumberImport.contains(dto.getNioNumber())) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += "参数编号重复！";
errorMsg += "NIO编号重复！";
} else {
errorMsg += "Parameter number already exists!";
errorMsg += "NIO number already exists!";
}
countError++;
} else {
@@ -1270,7 +1270,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数名称
String paramsName = dto.getParamsName();
resultMap = validateMustAndLength(paramsName, "参数名称", "Parameter Name", IsMustEnum.YES.getValue(), "500", false, cut);
resultMap = validateMustAndLength(paramsName, "参数名称", "Para Name", IsMustEnum.YES.getValue(), "500", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
@@ -1492,7 +1492,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// nio编号
String nioNumber = ccDto.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(ccDto.getNioNumber())) {
@@ -1500,9 +1500,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
if (!nioNumber.matches(nioNumberRegex)) {
if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += "参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
} else {
errorMsg += "Parameter number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
}
countError++;
}
@@ -1565,9 +1565,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
.collect(Collectors.joining(","));
if (StringUtils.isNotBlank(reduceOne)) {
if (CutEnum.CN.getValue().equals(cut)) {
stringMessage.add("导入数据中参数编号：" + reduceOne + "下存在重复认证类别；");
stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；");
} else {
stringMessage.add("Repeat cert category exist in Parameter Number: " + reduceOne + "; ");
stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + "; ");
}
}
}
@@ -1586,9 +1586,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
.collect(Collectors.joining(","));
if (StringUtils.isNotBlank(reduceTwo)) {
if (CutEnum.CN.getValue().equals(cut)) {
stringMessage.add("导入数据中参数编号：" + reduceTwo + "下存在重复认证编号；");
stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；");
} else {
stringMessage.add("Repeat number exist in Parameter Number: " + reduceTwo + "; ");
stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + "; ");
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoCnImport {
private String description;
/**nio编号*/
@Excel(name = "*参数编号", width = 15, orderNum = "1")
@Excel(name = "*NIO编号", width = 15, orderNum = "1")
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoEnExport {
private String description;
/**nio编号*/
@Excel(name = "*Parameter Number", width = 15, orderNum = "1")
@Excel(name = "*NIO Number", width = 15, orderNum = "1")
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoEnImport {
private String description;
/**nio编号*/
@Excel(name = "*Parameter Number", width = 15, orderNum = "1")
@Excel(name = "*NIO Number", width = 15, orderNum = "1")
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
+1 -1
View File
@@ -13,7 +13,7 @@ import lombok.Data;
public class ParamsInfoCnImport {
/**nio编号*/
@Excel(name = "*参数编号", width = 15)
@Excel(name = "*NIO编号", width = 15)
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class ParamsInfoEnExport {
private String sysOrgCode;
/**nio编号*/
@Excel(name = "*Parameter Number", width = 15)
@Excel(name = "*NIO Number", width = 15)
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
+1 -1
View File
@@ -13,7 +13,7 @@ import lombok.Data;
public class ParamsInfoEnImport {
/**nio编号*/
@Excel(name = "*Parameter Number", width = 15)
@Excel(name = "*NIO Number", width = 15)
@ApiModelProperty(value = "nio编号")
private String nioNumber;
jero-web/.env
+1 -1
View File
@@ -1,3 +1,3 @@
NODE_ENV=production
VUE_APP_PLATFORM_NAME=全球法规平台
VUE_APP_PLATFORM_NAME=蔚来全球法规平台
VUE_APP_SSO=false
jero-web/public/index.html
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>全球法规平台</title>
<title>蔚来全球法规平台</title>
<!--<link rel="icon" href="<%= BASE_URL %>logo.png">-->
<script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
<script src="<%= BASE_URL %>api_address_config.js"></script>
jero-web/src/common/lang/en-us.js
+9 -9
View File
@@ -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',
jero-web/src/common/lang/zh-cn.js
+9 -9
View File
@@ -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: '行业资讯动态模板',
jero-web/src/components/layouts/Tabcrumbs.vue
+2 -2
View File
@@ -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) {
jero-web/src/components/tools/Logo.vue
+5 -5
View File
@@ -1,13 +1,13 @@
<template>
<div class="logo">
<!-- <router-link :to="{name:'dashboard'}">-->
<router-link :to="{name:'dashboard'}">
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<!-- <img v-if="!collapsed" src="~@/assets/logo.png" alt="logo" class="logoImg">-->
<!-- <img v-if="collapsed" src="~@/assets/logoOne.png" alt="logo" class="logoImgOne">-->
<img v-if="!collapsed" src="~@/assets/logo.png" alt="logo" class="logoImg">
<img v-if="collapsed" src="~@/assets/logoOne.png" alt="logo" class="logoImgOne">
<!-- <img v-else src="~@/assets/logo.png" alt="logo">-->
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<!-- <span v-if="showTitle && !collapsed" class="logoTitle">{{ title }}</span>-->
<!-- </router-link>-->
<span v-if="showTitle && !collapsed" class="logoTitle">{{ title }}</span>
</router-link>
</div>
</template>