Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2023-03-17 17:59:47 +08:00
136 changed files with 12623 additions and 3342 deletions
+10 -8
View File
@@ -1108,8 +1108,9 @@ module.exports = {
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',
theProjectContactEmpty: 'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected',
TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be empty',
pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published',
TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List to Be Checked or whose verification compliance confirmation process status is List to Be Checked',
theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
bringInTheProjectInterface: 'Assign to Owner',
theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
@@ -1511,12 +1512,6 @@ module.exports = {
dateofproduction:'Date of production',
VINcodelist:'VIN code list',
VINcodeupload:'VIN code upload',
recordmaintenance:'Record maintenance',
upgradecompletion:'Upgrade completion',
implementedupgrade:'Whether the implemented upgrade is consistent with the record',
numberofvehicles:'Number of vehicles that have completed upgrades',
vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade',
implementationrecords:'Fault handling measures and emergency response implementation records',
Tasknode:'Task Node',
Taskresponsibilityrecognition:'Task responsibility recognition',
uploadattachment:'Upload attachment',
@@ -1658,4 +1653,11 @@ module.exports = {
upgradeplanexpirationtime:'Upgrade plan expiration time',
resultofhandling:'Result of handling',
Listoftreatableregulations:'List of treatable regulations',
Listofuntractableregulations:'List of untractable regulations',
project:'Project',
Categoryofdeliverables:'Category of deliverables',
Taskconfirmationresult:'Task confirmation result',
Compliancetaskhandling:'Compliance task handling'
}