From f2e7f643391d8f65233142cbd1ba33b888109ab7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 9 Aug 2022 09:51:39 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 63 ++++++++++--------- jero-web/src/common/lang/zh-cn.js | 3 + .../parameterlist/components/addModel.vue | 10 +-- .../ParameterItemCollectionList.vue | 2 +- .../components/TaskParameterCollection.vue | 2 +- 5 files changed, 43 insertions(+), 37 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b49b90765..6f957808f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -603,9 +603,9 @@ module.exports = { verificationAndConformityconfirmation: 'Validation Compliance Check', StandardImplementationDate: 'New Type Execution Date', regulatoryEngineer: 'Regulation Engineer', - certifiedEngineer: 'Homologation Engineer', + certifiedEngineer: 'Homo Engineer', regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer Or Homologation Engineer', - engineeringInterfacePerson: 'Engineering Interface', + engineeringInterfacePerson: 'Eng. Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', entryName: 'Project Name', @@ -671,7 +671,7 @@ module.exports = { standardName: 'Standard Name', initiateListConfirmation: 'Initiate List Confirmation', initiateTaskConfirmation: 'Initiate Task Confirmation', - alteration: 'Change', + alteration: 'Modify', fixedPlate: 'Fix the version ', taskAffirmStatus: 'Task Confirmation Status', taskAffirm: 'Task Confirmation', @@ -725,7 +725,7 @@ module.exports = { timeOperation: 'You have permission to operate this button.', NiOnumberis: 'NiO number is', NoOperationPermissionForthisbutton: 'No Operation permission for this button', - Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', + 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.', Datastatusis: 'Datastatusis', Dropdownradio: 'Drop Down Radio', @@ -734,7 +734,7 @@ module.exports = { positiveInteger: 'Positive Integer', // 参数收集开始 MaintainConfigureInfo: 'Maintain Configuration Information', - ParameteItemCollectionList: 'Parameter item collection list', + ParameteItemCollectionList: 'Parameter Collection List', ParameterViewPage: 'Parameter View Page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', @@ -766,27 +766,27 @@ module.exports = { operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', referenceparameter: 'Reference Parameter', - tempSave: 'Temp Save', - Assignedby: 'Assignedby', - CompulsoryWithdrawal: 'CompulsoryWithdrawal', - SynchronousReportLibrary: 'Synchronous Report Library', + tempSave: 'Save', + Assignedby: 'Assign', + CompulsoryWithdrawal: 'Revoke', + SynchronousReportLibrary: 'Sync to the Library', FreezeConfiguration: 'Freeze Configuration', - distributionAndCollection: 'Distribution And Collection', + distributionAndCollection: 'Distribute & Collect', OneclickCollection: 'One-click Collection', deleteConfiguration: 'Delete Configuration', addConfiguration: 'Add Configuration', - electricMachinery: 'ElectricMachinery', + electricMachinery: 'E-motor', Battery: 'Battery', Model: 'Model', configurationName: 'Configuration Name', historicalVersion: 'Historical Version', - configure: 'Configure', + configure: 'Configuration', parameter: 'Parameter', changeExtension: 'Change Extension', addDetailList: 'Add', detailedList: 'DetailedList', copyParamDetailList: 'Copy Parameter List', - collectionCompletionTime: 'Collection Completion Time', + collectionCompletionTime: 'Collection Completed', parameterTemplateName: 'Parameter Template Name', onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces', templateName: 'Template Name', @@ -794,9 +794,9 @@ module.exports = { templateCopy: 'Template Copy', NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', attachmentTemplate: 'Attachment Template', - controlAlternatives: 'Control Alternatives', - controlVerification: 'Control Verification', - controlType: 'Control Type', + controlAlternatives: 'Control Component', + controlVerification: 'Validate Component', + controlType: 'Control Component', certificationCategory: 'Certification Category', parameterBatch: 'Parameter Batch', releaseVersion: 'Release Version', @@ -819,7 +819,7 @@ module.exports = { OperationNode: 'Operation Node', taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', selectInquiry: 'Select Inquiry', - sendBack: 'Send Back', + sendBack: 'Reject', taskConfirmationProcess: 'Task confirmation process', notFinished: 'Assigned', Finished: 'Complete', @@ -843,7 +843,7 @@ module.exports = { technicalEvaluationResults: 'Technical Evaluation Results', engineeringConfirmation: 'Engineering Deliverables', feedbackFromTheEngineer: 'Engineer Comment', - completedBy: 'SdtPeople', + completedBy: 'Filled by', completedTime: 'Completed Time', replyFromProjectContactPerson: 'Assignee Reply', answer: 'Answer', @@ -957,14 +957,14 @@ module.exports = { reportNotUploaded: 'Report not uploaded', position: 'Position', // 认证权限状态 - CollectionInitiated: 'Wait Collect', - handledInterface: 'Wait Sdt', - ReturnedPerson: 'Sdt Back', - completed: 'Wait Fill', - Filledreturn: 'Dre Back', - Submitted: 'Submit', - ReturnedEngineer: 'Cert Back', - SynchronizedLibrary: 'Sync Report', + CollectionInitiated: 'To be collected', + handledInterface: 'To be processed by eng. interface', + ReturnedPerson: 'Rejected by eng. interface', + completed: 'To be filled', + Filledreturn: 'Rejected by the applicant', + Submitted: 'Submitted', + ReturnedEngineer: 'Rejected by homo engineer', + SynchronizedLibrary: 'Synced to library', Statusis: 'Statusis', toHavePermission: 'To Have Permission', and: 'And', @@ -1050,12 +1050,12 @@ module.exports = { NNiONumber: 'NIO Number', ParameterNo: 'Number', NRequired: 'Is Must', - NParameterName: 'Params Name', + NParameterName: 'Para Name', NtechnicalField: 'Tech field', NparameterBatch: 'Params Batch', - NareaOfResponsibility: 'Duty Territory', + NareaOfResponsibility: 'Responsible Field', NParameterDescription: 'Description', - NcertificationCategory: 'Cert Category', + NcertificationCategory: 'Cert', NcontrolType: 'Control Type', NcontrolVerification: 'Control Verify', NcontrolAlternatives: 'Control Values', @@ -1092,7 +1092,7 @@ module.exports = { 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', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', - bringInTheProjectInterface: 'Bring in the project interface', + bringInTheProjectInterface: 'Assign to Owner', theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved', defaultTemplate: 'Default Template', newRequestCommentListTemplate: 'New request for comment list template', @@ -1246,4 +1246,7 @@ module.exports = { updated:'Updated', OpenOne:'Open', Privacy:'Privacy', + Paraname: 'Para Name', + Parabatch: 'Para Batch', + freeze:'Please select the configuration you want to freeze', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 427f67d80..fc6004fba 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1349,4 +1349,7 @@ module.exports = { punctuationmark:'只能输入除#号和逗号外的英文标点符号', created: '创建时间', updated:'更新时间', + Paraname: '参数名称', + Parabatch: '参数批次', + freeze:'请选择冻结配置', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 046e8655d..fb4aeaecb 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -50,13 +50,13 @@
* {{$t('NParameterName')}} + :title="$t('Paraname')">{{$t('Paraname')}}
+ :placeholder="$t('PleaseEnter')+$t('Paraname')"/> @@ -103,12 +103,12 @@
* {{$t('NparameterBatch')}} + :title="$t('Parabatch')">{{$t('Parabatch')}}
@@ -388,7 +388,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('Required'), trigger: 'change' }, ], paramsName: [ - { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' }, + { required: true, message: this.$t('pleaseSelect')+this.$t('Paraname'), trigger: 'blur' }, { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], technologyTerritory: [ diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ca4ca84d0..a19b42892 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -255,7 +255,7 @@ - diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index e172375ac..7b980f74e 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -174,7 +174,7 @@ dataIndex: 'createBy' }, { - title: this.$t('createTime'), + title: this.$t('created'), align: 'center', width: 160, ellipsis: true, From 2f99a59ff369e94a23f8642e05d096d35d975a9f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 9 Aug 2022 09:59:32 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/countryCardReleaseModel.vue | 32 +++--- .../components/countryCardReleaseModelAdd.vue | 98 ++++++++++++++----- 4 files changed, 99 insertions(+), 37 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6f957808f..3d055af07 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1249,4 +1249,7 @@ module.exports = { Paraname: 'Para Name', Parabatch: 'Para Batch', freeze:'Please select the configuration you want to freeze', + optionDropDownBox:'Option drop - down box', + attachmentUpload:'file', + textInput:'Text Input', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index fc6004fba..ca601c3ca 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1349,6 +1349,9 @@ module.exports = { punctuationmark:'只能输入除#号和逗号外的英文标点符号', created: '创建时间', updated:'更新时间', + optionDropDownBox:'下拉选择', + attachmentUpload:'附件上传', + textInput:'文本输入', Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue index 986380fcd..9f4811cac 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -24,7 +24,12 @@ :loading="loading"> {{$t('edit')}} - {{$t('delete')}} + {{$t('delete')}} + + + {{$t('optionDropDownBox')}} + {{$t('attachmentUpload')}} + {{$t('textInput')}}
@@ -51,7 +56,7 @@