From f94ead44bc5df11e9968e814c0f4f0a75486f2de Mon Sep 17 00:00:00 2001 From: lixuetao Date: Fri, 15 Jul 2022 11:12:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=88=86=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E8=B0=83=E6=95=B4=E4=B8=AD=E8=8B=B1=E6=96=87=E5=A4=A7?= =?UTF-8?q?=E5=86=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 302 +++++++++++++++--------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b110387d9..481de6cf2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -6,7 +6,7 @@ module.exports = { pleaseSelect: 'Please Select', male: 'Male', female: 'Female', - RealName: 'User name', + RealName: 'User Name', pleaseEnter: 'Please Enter', phoneNumber: 'Phone Number', query: 'Search', @@ -23,7 +23,7 @@ module.exports = { recycleBin: 'Recycle Bin', delete: 'Delete', thaw: 'Thaw', - batchOperation: 'Batch operation', + batchOperation: 'Batch Operation', selected: 'Selected', term: 'Term', empty: 'Empty', @@ -37,16 +37,16 @@ module.exports = { freezePasManagementPage: 'This is the user management page?', serialNumber: 'Number', userAccount: 'User Account', - userName: 'User name', - department: 'Department', + userName: 'User Name', + Department: 'Department', status: 'Status', - operation: 'Operation', + Operation: 'Operation', aRcord: 'A Rcord', - operationAllowedAccount: 'This operation is not allowed for administrator account, please select again!', + OperationAllowedAccount: 'This Operation is not Allowed for administrator account, please select again!', confirm: 'Confirm', selectedAccount: 'Selected account?', whether: 'Whether', - adminDoNotAllowOperation: 'The administrator account does not allow this operation!', + adminDoNotAllowOperation: 'The administrator account does not Allow this Operation!', advancedQuery: 'Advanced Search', constructor: 'Constructor', advancedQueryEffective: 'Advanced Search criteria are already effective', @@ -56,10 +56,10 @@ module.exports = { no: 'No', click: 'Click', add: 'Add', - FilterMatching: 'Filter condition matching', + FilterMatching: 'Filter Condition Matching', AllMatching: '(All conditions require matching)', AnyOneMatches: '(Any one of the conditions matches)', - SelectQueryField: 'Select Search field', + SelectQueryField: 'Select Search Field', matchRules: 'Matching Rules', beEqualTo: 'Be Equal To', contain: 'Contain', @@ -75,29 +75,29 @@ module.exports = { numericalValue: 'Numerical Value', not: 'No.', notOnlyRz: 'No', - EnterValue: 'Please Enter a Value', + EnterValue: 'Please Enter A Value', SavedQuery: 'Saved Search', NoQueriesSaved: 'No Queries Were Saved', SavedName: 'Saved Name', - CannotQueryEmpty: 'Cannot Search empty condition', + CannotQueryEmpty: 'Cannot search empty condition', EmptyCannotSaved: 'Empty condition cannot be saved', - cannotEmpty: 'Cannot be empty', + cannotEmpty: 'Cannot Be Empty', name: 'Name', AlreadyExists: 'Already exists, overwrite?', - SavedSuccessfully: 'Saved successfully', + SavedSuccessfully: 'Saved Successfully', DeleteQuery: 'Delete current Search?', - VersionNotSupported: 'Version not supported', + VersionNotSupported: 'Version Not Supported', SaveQueryCriteria: 'Save Search criteria', - roleName: 'Role name', - newRole: 'New role', - RoleManagement: 'Role management', + roleName: 'Role Name', + newRole: 'New Role', + RoleManagement: 'Role Management', toGrantAuthorization: 'Authorized', newUser: 'New User', - ExistingUsers: 'Existing users', + ExistingUsers: 'Existing Users', total: 'Total', strip: 'Data', RoleCode: 'Role Code', - createTime: 'Creation time', + createTime: 'Creation Time', userName: 'User Name', selectOneRule: 'Please select a role!', setAttribute: 'Please set the url.list2 attribute!', @@ -111,23 +111,23 @@ module.exports = { DepartmentInformation: 'Department Information', BatchDelete: 'Batch Delete', DeleteMultiplePiecesData: 'Delete multiple pieces of data', - CurrentSelection: 'Current selection', + CurrentSelection: 'Current Selection', Deselect: 'Deselect', - enterDepartmentName: 'Please enter department name', + enterDepartmentName: 'Please enter Department name', addTo: 'Add', cancel: 'Cancel', - checkAll: 'Check all', - DeselectAll: 'Deselect all', - ExpandAll: 'Expand all', - MergeAll: 'Merge all', - TreeOperation: 'Tree operation', - essentialInformation: 'General information', + checkAll: 'Check All', + DeselectAll: 'Deselect All', + ExpandAll: 'Expand All', + MergeAll: 'Merge All', + TreeOperation: 'Tree Operation', + essentialInformation: 'General Information', OrganizationName: 'Organization Name', EnterOrganizationDepartment: 'Please enter organization / department name', - SuperiorDepartment: 'Superior department', + SuperiorDepartment: 'Superior Department', enterOrganizationCode: 'Please enter organization code', nothing: 'Nothing', - OrganizationType: 'Organization type', + OrganizationType: 'Organization Type', PleaseSelectOrganizationType: 'Please select organization type', company: 'Company', post: 'Post', @@ -137,119 +137,119 @@ module.exports = { address: 'Address', remarks: 'Comments', enterComments: 'Please enter comments', - selectDepartmentFirst: 'Please select a department first!', - OrganizationCode: 'Organization code', + selectDepartmentFirst: 'Please select a Department first!', + OrganizationCode: 'Organization Code', fax: 'Fax', enterOrganizationType: 'Please enter organization type', sureDeleteSelected: 'Are you sure you want to delete the selected', pieceData: 'piece of data and child node data?', - selectSuperiorDepartmentFirst: 'Please click to select the superior department first', - deleteDepartmentData: 'Are you sure you want to delete this department and child node data?', - DeleteSucceeded: 'Delete succeeded', - DeletionFailed: 'Deletion failed', - departmentInformationDepartment: 'There is no valid department information under your department', + selectSuperiorDepartmentFirst: 'Please click to select the superior Department first', + deleteDepartmentData: 'Are you sure you want to delete this Department and child node data?', + DeleteSucceeded: 'Delete Succeeded', + DeletionFailed: 'Deletion Failed', + DepartmentInformationDepartment: 'There is no valid Department Information under your Department', permissionTemporrily: 'This permission is temporarily granted to ordinary employees', - DepartmentRole: 'Department role', - DictionaryName: 'Dictionary name', + DepartmentRole: 'Department Role', + DictionaryName: 'Dictionary Name', enterDictionary: 'Please enter a dictionary name', - DictionaryNumber: 'Dictionary number', + DictionaryNumber: 'Dictionary Number', enterDictionaryNumber: 'Please enter the dictionary number', - DictionaryInformation: 'Dictionary information', - RefreshCache: 'Refresh cache', + DictionaryInformation: 'Dictionary Information', + RefreshCache: 'Refresh Cache', recycleBin: 'Recycle Bin', - DictionaryConfiguration: 'Dictionary configuration', + DictionaryConfiguration: 'Dictionary Configuration', dataDictionaryPage: 'This is the data dictionary page', describe: 'Description', DescriptionRefreshCache: 'Description refresh cache complete!', FailedRefreshCache: 'Failed to refresh cache!', - refreshFailed: 'refresh failed', - ClassificationDictionary: 'Classification dictionary', + refreshFailed: 'Refresh Failed', + ClassificationDictionary: 'Classification Dictionary', ClassifManagementPage: 'Classification dictionary management page', - ClassificationName: 'Classification name', - ClassificationCode: 'Classification code', - AddSubcategory: 'Add subcategory', - DataRules: 'Data rules', + ClassificationName: 'Classification Name', + ClassificationCode: 'Classification Code', + AddSubcategory: 'Add Subcategory', + DataRules: 'Data Rules', menuMnagementPage: 'This is the menu management page', - MenuName: 'Menu name', - MenuEnName: 'Menu En name', + MenuName: 'Menu Name', + MenuEnName: 'Menu En Name', enterMenuEnName: 'Please enter menu En name', - MenuType: 'Menu type', + MenuType: 'Menu Type', menu: 'Menu', - ButtonsPermissions: 'Buttons / permissions', - ConventionalExport:'Conventional export', - CustomExport:'Custom export', + ButtonsPermissions: 'Buttons / Permissions', + ConventionalExport:'Conventional Export', + CustomExport:'Custom Export', CustomTemplateName:'Custom template name', assembly: 'Assembly', route: 'Route', - AddSubmenu: 'Add submenu', - NoPicture: 'No picture', + AddSubmenu: 'Add Submenu', + NoPicture: 'No Picture', noFile: 'No File', adadManagementPage: 'Adad Management Page', - TenantName: 'Tenant name', - TenantNumber: 'Tenant number', - startTime: 'Start time', + TenantName: 'Tenant Name', + TenantNumber: 'Tenant Number', + startTime: 'Start Time', endTime: 'End Time', LoginLog: 'Login Log', - OperationLog: 'Operation log', - SearchLog: 'Search log', + OperationLog: 'Operation Log', + SearchLog: 'Search Log', enterSearchKeyword: 'Please enter a search keyword', - OperationType: 'Operation type', - selectOperationType: 'Please select operation type', - RequestMethod: 'Request method', - RequestParameters: 'Request parameters', + OperationType: 'Operation Type', + selectOperationType: 'Please select Operation type', + RequestMethod: 'Request Method', + RequestParameters: 'Request Parameters', logManagementPage: 'This is the log management page', - LogContent: 'Log content', + LogContent: 'Log Content', OperatorID: 'Operator ID', - OperatorName: 'Operator name', - ElapsedTime: 'Elapsed time (MS)', - LogType: 'Log type', + OperatorName: 'Operator Name', + ElapsedTime: 'Elapsed Time (MS)', + LogType: 'Log Type', tableName: 'Table Name', enterTableName: 'Please enter a table name', DataID: 'Data ID', - enterID: 'Please enter ID', - DataComparison: 'Data comparison', + enterID: 'Please Enter ID', + DataComparison: 'Data Comparison', DataLogManagementPage: 'Data log management page', VersionNumber: 'Version', - DataContent: 'Data content', + DataContent: 'Data Content', creator: 'Creator', selectTwoPiecesData: 'Please select two pieces of data', selectSameDatabase: 'Please select the same database table and data ID for comparison', - DataComparison: 'Data comparison', - PromptInformation: 'Prompt information', + DataComparison: 'Data Comparison', + PromptInformation: 'Prompt Information', enterAccountNumber: 'Please enter the account number', - AddExistingUsers: 'Add existing users', + AddExistingUsers: 'Add Existing Users', newUser: 'New User', disassociate: 'Disassociate', - AssignDepartmentRoles: 'Assign Department roles', + AssignDepartmentRoles: 'Assign Department Roles', userDetail: 'User Details', - AreYouCancelAssociation: ' Are you sure to cancel the association with the selected department?', + AreYouCancelAssociation: ' Are you sure to cancel the association with the selected Department?', setURLListAttribute: 'Please set the url.list attribute!', setURLDeletebatchAttribute: 'Please set the URL Deletebatch attribute!', - NoDepartmentSelected: 'No department is selected, unable to cancel the association between department and user!', - ConfirmCancellation: 'Confirm cancellation', - CancelAssociation: 'Cancel the association between the user and the selected department?', - SuccessfullyDeleted: 'Successfully deleted the relationship between the user and the selected department!', + NoDepartmentSelected: 'No Department is selected, unable to cancel the association between Department and user!', + ConfirmCancellation: 'Confirm Cancellation', + CancelAssociation: 'Cancel the association between the user and the selected Department?', + SuccessfullyDeleted: 'Successfully deleted the relationship between the user and the selected Department!', setURLDeleteAttribute: 'Please set the url.delete attribute!', - DepartmentRole: 'Department role assignment', - DepartmentRoleName: 'Department role name', + DepartmentRole: 'Department Role Assignment', + DepartmentRoleName: 'Department Role Name', enterDepartmentRole: 'Please enter department role', - NewDepartmentRole: 'New department role', - DepartmentRoleInformation: 'Department role information', - DepartmentRoleCode: 'Department role code', + NewDepartmentRole: 'New Department Role', + DepartmentRoleInformation: 'Department Role Information', + DepartmentRoleCode: 'Department Role Code', enterUserAccount: 'Please enter user account', NoConfigurableRoles: 'No configurable roles!', AreYouWantDiscardEditing: 'Are you sure you want to discard editing?', determine: 'Confirmed', - DictionaryCoding: 'Dictionary coding', + DictionaryCoding: 'Dictionary Coding', enterDictionaryCode: 'Please enter dictionary code', - DictionaryList: 'Dictionary list', + DictionaryList: 'Dictionary List', enterName: 'Please enter a name', disable: 'Disable', - DataValue: 'Data value', + DataValue: 'Data Value', enterDataValue: 'Please enter a data value', - DictionaryRetrieval: 'Dictionary retrieval', - CompletelyDelete: 'Completely delete', - FirstLevelMenu: 'First level menu', + DictionaryRetrieval: 'Dictionary Retrieval', + CompletelyDelete: 'Completely Delete', + FirstLevelMenu: 'First Level Menu', Submenu: 'Submenu', enterMenuName: 'Please enter menu name', SuperiorMenu: 'Duperior Menu', @@ -257,58 +257,58 @@ module.exports = { selectParentMenu: 'Please select parent menu', MenuPath: 'Menu Route', enterMenuPath: 'Please enter the menu path', - FrontAssembly: 'Front end assembly', + FrontAssembly: 'Front End Assembly', enterFrontComponents: 'Please enter front-end components', - DefaultJumpAddress: 'Default jump address', + DefaultJumpAddress: 'Default Jump Address', enterRoutingParameters: 'Please enter routing parameters', AuthorizationID: ' Authorization ID', enterAuthorizationID: 'Please enter the authorization ID, such as:', PleaseEnterAuthorizationID: 'Please enter authorization ID!', - AuthorizationPolicy: 'Authorization policy', + AuthorizationPolicy: 'Authorization Policy', selectAuthorizationPolicy: 'Please select authorization policy', selectStatus: 'Please select a status', - MenuIcon: 'Menu icon', + MenuIcon: 'Menu Icon', ClickSelectIcon: 'Click the select icon', enterMenuSort: 'Please enter menu sort', - RouteMenu: 'Route menu', - HideRoute: 'Hide route', - CacheRoute: 'Cache route', - AggregateRouting: 'Aggregate routing', - OpenMode: 'Open mode', + RouteMenu: 'Route Menu', + HideRoute: 'Hide Route', + CacheRoute: 'Cache Route', + AggregateRouting: 'Aggregate Routing', + OpenMode: 'Open Mode', external: 'External', inside: 'Inside', enterMenuTitle: 'Please enter the menu title', enterAuthorizationPolicy: 'Please enter authorization policy', AuthorizationIDExists: 'Authorization ID already exists', enterPositiveInteger: 'Please enter a positive integer', - RuleName: 'Rule name', + RuleName: 'Rule Name', enterRuleName: 'Please enter a rule name', - RuleField: 'Rule field', + RuleField: 'Rule Field', enterRuleField: 'Please enter the rule field', - ConditionalRules: 'Conditional rules', + ConditionalRules: 'Conditional Rules', enterConditionRule: 'Please enter condition rule', - RuleValue: 'Rule value', + RuleValue: 'Rule Value', enterRuleValue: 'Please enter a rule value', effective: 'Effective', invalid: 'Invalid', selectCondition: 'Please select a condition', - DataPermissionRules: 'Data permission rules', - LoginPassword: 'Login password', + DataPermissionRules: 'Data Permission Rules', + LoginPassword: 'Login Password', enterLoginPassword: 'Please enter the login password', - ConfirmPassword: 'Confirm password', + ConfirmPassword: 'Confirm Password', reenterLoginPassword: 'Please re-enter your login password', enterUserName: 'Please enter user name', - RoleAssignment: 'Role assignment', + RoleAssignment: 'Role Assignment', selectUserRole: 'Please select user role', - DepartmentAllocation: 'Department allocation', - ClickSelectDepartment: 'Click to select a department', + DepartmentAllocation: 'Department Allocation', + ClickSelectDepartment: 'Click to select a Department', choice: 'Choice', identity: 'Identity', - OrdinaryUsers: 'Ordinary users', - superior: 'superior', - ResponsibleDepartment: 'Responsible department', - selectResponsibleDepartment: 'Please select the responsible department', - selectGender: 'Please select gender', + OrdinaryUsers: 'Ordinary Users', + superior: 'Superior', + ResponsibleDepartment: 'Responsible Department', + selectResponsibleDepartment: 'Please select the responsible Department', + selectGender: 'Please Select Gender', mailbox: 'Mailbox', enterEmailAddress: 'Please enter email address', enterMobileNumber: 'Please enter your mobile phone number', @@ -320,29 +320,29 @@ module.exports = { passwordsEnteredTwice: 'The passwords entered twice are different', PnumberExists: 'Phone number already exists', enterPhoneCorrect: 'Please enter the phone number in the correct format', - MailboxExists: 'Mailbox already exists', + MailboxExists: 'Mailbox Already Exists', enterMailboxCorrect: 'Please enter a mailbox in the correct format', UserExists: 'User name already exists', nameExists: 'User name already exists', - uploadPictures: 'Please upload pictures', - DepartmentSearch: 'Department search', - selectSuperiorDepartment: 'Please select superior department', + uploadPictures: 'Please Upload Pictures', + DepartmentSearch: 'Department Search', + selectSuperiorDepartment: 'Please select superior Department', upload1: 'Upload', - UploadFailed: 'Upload failed', - ResetPassword: 'Reset password', - ClearSelection: 'Clear selection', - BatchRestore: 'Batch restore', - RestoreUser: 'Restore user', + UploadFailed: 'Upload Failed', + ResetPassword: 'Reset Password', + ClearSelection: 'Clear Selection', + BatchRestore: 'Batch Restore', + RestoreUser: 'Restore User', FailedQuery: 'Failed to Search deleted users:', headPortrait: 'Head Portrait', - RestorUser: 'Restore user', + RestorUser: 'Restore User', sureRestore: 'Are you sure you want to restore this', Users: 'Users', reduction: 'Reduction', UsersSucceeded: 'Users Succeeded!', standard: 'Number', title: 'Title', - TextStatus: 'TextStatus', + TextStatus: 'Text Status', PleaseEnter: 'Please enter', PleaseSelect: 'Please select', PleaseEnterOrSelect: 'Please Enter Or Select', @@ -354,7 +354,7 @@ module.exports = { Push: 'Push', templateDownload: 'Template download', textInformation: 'Document files', - relatedInformation: 'Relevant information', + relatedInformation: 'Relevant Information', RetrieveFiles: 'Select Stored File', SplitText: 'Split Stored File', ImportResults: 'Import Split Results', @@ -388,7 +388,7 @@ module.exports = { StandardDetails: 'Standard Details', whole: 'Whole', DocumentLibrary: 'Document Library', - GeneralExportInformation:'General export information', + GeneralExportInformation:'General export Information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', @@ -407,7 +407,7 @@ module.exports = { NewLabelItem: 'Add Tag Item', editLabelItem: 'Edit Tag Item', NodeQuickLookup: 'Node quick lookup', - AreAllLabelsRead: 'Are all labels read', + AreAllLabelsRead: 'Are All labels read', AllLabelsRead: 'Labels Read', SubscriptionNotification: 'Subscription notification', warningInformation: 'Warning Information', @@ -420,7 +420,7 @@ module.exports = { MessageNotification: 'Message Notification', SeeMore: 'See more', OperationSuccessful: 'Operation successful', - operationFailed: 'Operation Failed', + OperationFailed: 'Operation Failed', PersonnelSelection: 'Personnel Selection', EmployeeNumber: 'Employee ID', EmployeeType: 'Employee Type', @@ -492,8 +492,8 @@ module.exports = { notInvolved: 'NA', Operator: 'Operator', role: 'Role', - operationContent: 'Operation Content', - operationTime: 'Operation time', + OperationContent: 'Operation Content', + OperationTime: 'Operation time', ConfirmReplication: 'Confirm replication', ProcessName: 'Process name', ProcessType: 'Process Type', @@ -530,7 +530,7 @@ module.exports = { clauseNo: 'Item No.', functionalAreas: 'Functional Areas', technicalField: 'Technical Field', - informationCategory: 'Information Category', + InformationCategory: 'Information Category', contentValidity: 'Content Validity', content: 'Content', Add: 'Add', @@ -571,7 +571,7 @@ module.exports = { StandardBreakdown: 'Standard Breakdown', OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file', OnlyWord: 'Only word files can be imported', - labelAreaDeleted: 'If it is deleted, all label items under the display area will be deleted', + labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted', searchInResults: 'Search in results', searchContent: 'Search content', viewFile: 'View file', @@ -613,8 +613,8 @@ module.exports = { CertificationTime: 'Certification Time', NTplatform: 'NT platform', NPplatform: 'NP platform', - IPDInformation: 'IPD information', - certificationProgramInformation: 'Certification program information', + IPDInformation: 'IPD Information', + certificationProgramInformation: 'Certification program Information', taskReleaseStatus: 'Task release status', task: 'Task', TaskCutOffTime: 'Due Date', @@ -719,9 +719,9 @@ module.exports = { enclosure: 'Enclosure', // 认证 // 认证状态 - timeoperation: 'You have permission to operate this button.', + timeOperation: 'You have permission to operate this button.', NiOnumberis: 'NiO number is', - NoOperationPermissionForthisbutton: 'No operation permission for this button', + NoOperationPermissionForthisbutton: 'No Operation permission for this button', Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', Datastatusis: 'Datastatusis', @@ -730,7 +730,7 @@ module.exports = { a: '+', positiveInteger: 'Positive integer', // 参数收集开始 - MaintainConfigureInfo: 'Maintain configuration information', + MaintainConfigureInfo: 'Maintain configuration Information', ParameteItemCollectionList: 'Parameter item collection list', ParameterViewPage:'Parameter View page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', @@ -746,11 +746,11 @@ module.exports = { Threedecimalplaces: 'Threedecimalplaces', FourDecimalplaces: 'FourDecimalplaces', Positivefloatingpointnumber: 'Positive floating point number', - oneconfigurationInformation: 'Contains at least one configuration information', + oneconfigurationInformation: 'Contains at least one configuration Information', Correspondingstandarddeleted: 'Correspondingstandarddeleted', changeTheTitle: 'Title already exists, please change the title', resetPassword: 'reset Password', - departmentAllocation: 'department Allocation', + DepartmentAllocation: 'Department Allocation', ListTitle: 'List Title', CopyProjectCollectionparameters: 'Copy Project Collection parameters', from: 'From', @@ -805,14 +805,14 @@ module.exports = { parameterTemplateExportName: 'Parameter List', parameterDataExport: 'Parameter Export Data', // 参数收集结束 - circulationInformation: 'Circulation information', + circulationInformation: 'Circulation Information', circulationHistory: 'Circulation History', agree: 'Agree', disagree: 'Disagree', feedbackMessage: 'Feedback Message', result: 'Result', opinion: 'Opinion', - operationNode: 'Operation Node', + 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', @@ -828,7 +828,7 @@ module.exports = { record: 'Record', replyToComments: 'Reply to comments', noComment: 'No comment', - theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of all data are received', + theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of All data are received', notEvaluated: 'Not evaluated', cannotExceed: 'Cannot exceed', Characters: 'Characters', @@ -917,7 +917,7 @@ module.exports = { Resubmit: 'Resubmit', Quantity: 'Quantity', pleaseConfirmationResults: 'Please select the compliance status according to the engineering confirmation results', - pleaseReviewTask: 'Please add the engineering confirmation information for this review task', + pleaseReviewTask: 'Please add the engineering confirmation Information for this review task', pleaseWillBeReturned: 'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', pleaseSubmitStatus: 'Please submit the data confirmed by the project in the confirmation status', modelName: 'Model Name', @@ -995,7 +995,7 @@ module.exports = { viewContent: 'View content', fillInTheMonth: 'Fill in the month', monthSelection: 'Month selection', - bringInStandardInformation: 'Bring in standard information', + bringInStandardInformation: 'Bring in standard Information', contentTemplate: 'Content template', moveUp: 'Move up', moveDown: 'Move down', @@ -1016,11 +1016,11 @@ module.exports = { collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions', collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process', feedbackInformation: 'Feedback Information', - relevantSections: 'Relevant sections', - questionsSuggestions: 'Questions or Suggestions', + relevantSections: 'Relevant Sections', + questionsSuggestions: 'Questions Or Suggestions', reason: 'Reason', - proposedTime:'Proposed time', - feedbackPoint: 'Feedback point', + proposedTime:'Proposed Time', + feedbackPoint: 'Feedback Point', link: 'Link', planNoChinese: 'Plan No.', standardNameCn: 'Standard Name Cn', From 19f7ee2f6d60bdc2cc5099c373e15c594acde4e1 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Fri, 15 Jul 2022 13:29:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 5af5e2560..f16014515 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -46,6 +46,6 @@ INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `updat VALUES ( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'domianPreviewURL' ); --- 消息表添加发起人字段 +-- 消息表添加发起人字段 已同步正式环境 ALTER TABLE `sys_announcement` ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`; From adc59505dc1d61a712a88d752613d635c0537cd2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 15 Jul 2022 13:37:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=8B=B1=E6=96=87=E9=A6=96=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 256 +++++++++++++++--------------- 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 481de6cf2..60fdea5ac 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -346,30 +346,30 @@ module.exports = { PleaseEnter: 'Please enter', PleaseSelect: 'Please select', PleaseEnterOrSelect: 'Please Enter Or Select', - ModificationTime: 'Modification time', - ModificationContent: 'Modification content', + ModificationTime: 'Modification Time', + ModificationContent: 'Modification Content', personnel: 'Personnel', - dataExport: 'Data export', + dataExport: 'Data Export', exportWithFile: 'Export with file', Push: 'Push', - templateDownload: 'Template download', - textInformation: 'Document files', + templateDownload: 'Template Download', + textInformation: 'Document Files', relatedInformation: 'Relevant Information', RetrieveFiles: 'Select Stored File', SplitText: 'Split Stored File', ImportResults: 'Import Split Results', copy: 'Copy', - TemplateDownload: 'Template download', - MergerClause: 'Merger clause', - BatchSetting: 'Batch setting', - BatchCancel: 'Batch cancel collection', + TemplateDownload: 'Template Download', + MergerClause: 'Merger Clause', + BatchSetting: 'Batch Setting', + BatchCancel: 'Batch Cancel Collection', SubscriptionManagement: 'Select Tech Fields', - BatchCancellation: 'Cancel by batch', - clickUpload: 'Click to upload', - viewUploadedFiles: 'View uploaded files', - standardSelection: 'Standard selection', - Collection: 'Add to collection', - CancelCollection: 'Cancel from collection', + BatchCancellation: 'Cancel By Batch', + clickUpload: 'Click To Upload', + viewUploadedFiles: 'View Uploaded Files', + standardSelection: 'Standard Selection', + Collection: 'Add to Collection', + CancelCollection: 'Cancel From Collection', deleteLib: 'Delete', subscribe: 'Subscribe', CancelSubscribe: 'Unsubscribe', @@ -393,25 +393,25 @@ module.exports = { weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', check: 'Proofread', - enName: 'English name', + enName: 'English Name', selectLeastOne: 'Please select at least one piece of data', selectFileType: 'Please select a file type', sureVerified: 'Are you sure this file is not verified?', sureSynchronize: 'The file has not been verified. Are you sure you want to synchronize to the document library?', - UploadFile: 'Upload file', + UploadFile: 'Upload File', TagItemManagement: 'Tag Item Management', LabelContentManagement: 'Tag Content Management', - InputBoxType: 'Input box type', - DropDownType: 'Drop down type', + InputBoxType: 'Input Box Type', + DropDownType: 'Drop Down Type', ExhibitionAreaManagement: 'Display Area Management', NewLabelItem: 'Add Tag Item', editLabelItem: 'Edit Tag Item', - NodeQuickLookup: 'Node quick lookup', - AreAllLabelsRead: 'Are All labels read', + NodeQuickLookup: 'Node Quick Lookup', + AreAllLabelsRead: 'Are All Labels Read', AllLabelsRead: 'Labels Read', - SubscriptionNotification: 'Subscription notification', + SubscriptionNotification: 'Subscription Notification', warningInformation: 'Warning Information', - ForwardPush: 'Forward push', + ForwardPush: 'Forward Push', PleaseSelectData: 'Please select data first', MessageContent: 'Message Content', MessageTitle: 'Message Title', @@ -419,18 +419,18 @@ module.exports = { NotificationTime: 'Notification Time', MessageNotification: 'Message Notification', SeeMore: 'See more', - OperationSuccessful: 'Operation successful', + OperationSuccessful: 'Operation Successful', OperationFailed: 'Operation Failed', PersonnelSelection: 'Personnel Selection', EmployeeNumber: 'Employee ID', EmployeeType: 'Employee Type', LabeItemName: 'Label Item Name', PleaseEnterLabelName: 'Please enter label name', - DisplayArea: 'Display area', + DisplayArea: 'Display Area', ChineseName: 'Attribute Name', - AttributeType: 'Attribute type', - FieldLength: 'Field length', - DisplayOrder: 'Display order', + AttributeType: 'Attribute Type', + FieldLength: 'Field Length', + DisplayOrder: 'Display Order', LabelName: 'Tag Name', LabelType: 'Tag Type', PleaseSelectLabelType: 'Please select a label type', @@ -442,10 +442,10 @@ module.exports = { PleaseEnterPropertyName: 'Please enter a property name', PleaseEnterYourEnglishName: 'Please enter your English name', PleaseSelectAttributeType: 'Please select an attribute type', - OptionContent: 'Option content', + OptionContent: 'Option Content', PleaseSelectOptionContent: 'Please select the option content', PleaseEnterFieldLength: 'Please enter the field length', - DisplayOrder: 'Display order', + DisplayOrder: 'Display Order', PleaseEnterDisplayOrder: 'Please enter the display order', Required: 'Required', DocumentLibraryModuleDisplay: 'Document library module display', @@ -455,16 +455,16 @@ module.exports = { Search: 'Search', SelectWhetherToSearch: 'Please select whether to search', DisplayOtherModules: 'Display of other modules', - RegulationsListDisplay: 'Regulations list display', + RegulationsListDisplay: 'Regulations List Display', selectDisplayListRegulations: 'Please select whether to display the list of regulations', - SearchCenterDisplay: 'Search center display', + SearchCenterDisplay: 'Search Center Display', selectSearchCenterDisplayed: 'Please select whether the search center is displayed', selectWhetherRequired: 'Please select whether it is required', SortNumber: 'Order', enterDisplayArea: 'Please enter the display area', charactersLength: '1 - 50 characters in length', enterSortingNumber: 'Please enter the sorting number', - ParentName: 'Parent name', + ParentName: 'Parent Name', charactersLength130: '1 - 30 characters in length', charactersLength1to300: '1 - 300 characters in length', OnlyOneSelected: 'Only one piece of data can be selected', @@ -473,7 +473,7 @@ module.exports = { away: 'Less', toDoProcess: 'To Do', processDone: 'Completed', - sentProcess: 'Initiated process', + sentProcess: 'Initiated Process', monitoringProcess: 'Monitor', ConfirmDeployment: 'Confirm deployment?', terminationProcess: 'Termination Process', @@ -493,19 +493,19 @@ module.exports = { Operator: 'Operator', role: 'Role', OperationContent: 'Operation Content', - OperationTime: 'Operation time', - ConfirmReplication: 'Confirm replication', - ProcessName: 'Process name', + OperationTime: 'Operation Time', + ConfirmReplication: 'Confirm Replication', + ProcessName: 'Process Name', ProcessType: 'Process Type', - AddProcess: 'Add process', - RelatedItems: 'Relevant items', + AddProcess: 'Add Process', + RelatedItems: 'Relevant Items', Sponsor: 'Initiator', - CurrentProcessor: 'Current processor', - LastProcessor: 'Last processor', + CurrentProcessor: 'Current Processor', + LastProcessor: 'Last Processor', ProcessingTime: 'Complete Date', cutoffTime: 'Due Date', - ProcessStatus: 'Process status', - CompletionTime: 'Completion time', + ProcessStatus: 'Process Status', + CompletionTime: 'Completion Time', draft: 'Draft', CannotExceed100characters: 'Cannot Exceed 100 characters', cantExeed: 'Cannot Exceed ', @@ -573,16 +573,16 @@ module.exports = { OnlyWord: 'Only word files can be imported', labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted', searchInResults: 'Search in results', - searchContent: 'Search content', - viewFile: 'View file', + searchContent: 'Search Content', + viewFile: 'View File', fileFormatIncorrect: 'The file format is incorrect', pleaseUploadFile: 'Please upload the file', documentSplitList: 'Document split list display', selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Virtual list name', - listStatus: 'List status', + VirtualListName: 'Virtual list Name', + listStatus: 'List Status', creater: 'Creater', withdraw: 'Withdraw', maintenanceList: 'Maintain List', @@ -611,8 +611,8 @@ module.exports = { projectStatus: 'Status', StudioEngineer: 'R&H Studio', CertificationTime: 'Certification Time', - NTplatform: 'NT platform', - NPplatform: 'NP platform', + NTplatform: 'NT Platform', + NPplatform: 'NP Platform', IPDInformation: 'IPD Information', certificationProgramInformation: 'Certification program Information', taskReleaseStatus: 'Task release status', @@ -623,17 +623,17 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NIO number', - ParameterName: 'Parameter name', - ParameterDescription: 'Parameter description', + NiONumber: 'NIO Number', + ParameterName: 'Parameter Name', + ParameterDescription: 'Parameter Description', Version: 'Version', certificationProgramTime: 'Certification program time', - ArchitecturePlatform: 'Architecture platform', + ArchitecturePlatform: 'Architecture Platform', ModelPlatform: 'Model Platform', ListOfRelevantPersonnel: 'Personal List', DeliverableStatus: 'Deliverable Status', CurrentStatusOfTheProject: 'Project Current State', - CurrentStatus: 'Current status', + CurrentStatus: 'Current Status', NonConformance: 'Non-compliant', listSubclauses: 'List Subclauses', fileType: 'File Type', @@ -650,8 +650,8 @@ module.exports = { onlyOnefileUploaded: 'Only One File can be uploaded', typeCannotUploaded: 'This Type of File Cannot be Uploaded', confirmWithdraw: 'Confirm Withdraw ?', - OperationDetails: 'Operation details', - OperationTime: 'Operation time', + OperationDetails: 'Operation Details', + OperationTime: 'Operation Time', oneTableAdded: 'Only one table can be added', addATable: 'Please add a table', pleaseUploadSplitFile: 'Please Upload Split File', @@ -659,13 +659,13 @@ module.exports = { confirmRelease: 'Confirm Release ?', UploadMost: 'You can only upload 20 at most', FileUploadFailed: 'File upload failed', - FileUploadedSuccessfully: 'File uploaded successfully', - DeletedSuccessfully: 'Deleted successfully', + FileUploadedSuccessfully: 'File uploaded Successfully', + DeletedSuccessfully: 'Deleted Successfully', confirmCopy: 'Confirm Copy ?', DigitalPlatform: 'Digital Platform', dehicleDevelopmentPlan: 'Vehicle Master Plan', certificationProgram: 'Homologation Plan', - DocumentStandard: 'Document standard', + DocumentStandard: 'Document Standard', standardName: 'Standard Name', initiateListConfirmation: 'Initiate list confirmation', initiateTaskConfirmation: 'Initiate task confirmation', @@ -692,8 +692,8 @@ module.exports = { projectDetails: 'Project Details', listOfRegulations: 'Regulation List', taskList: 'Task List', - TaskParameterCollection: 'Task parameter collection', - nonConformance: 'Non conformance', + TaskParameterCollection: 'Task Parameter Collection', + nonConformance: 'Non Conformance', deadlineForConfirmationOfDesignCompliance: 'Deadline for confirmation of design compliance', prehomoConfirmationDeadline: 'Pre-Homo confirmation deadline', verificationComplianceConfirmationDeadline: 'Verification compliance confirmation deadline', @@ -701,8 +701,8 @@ module.exports = { updateTime: 'Update Time', comment: 'Comment', historicalVersion: 'Historical version', - versionName: 'Version name', - finalizationTime: 'Finalization time', + versionName: 'Version Name', + finalizationTime: 'Finalization Time', setting: 'Setting', incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed can be submitted', date: 'Date', @@ -725,10 +725,10 @@ module.exports = { Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', 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', + Dropdownradio: 'Drop Down Radio', Dropdownmultipleselection: 'Drop down multiple selection', a: '+', - positiveInteger: 'Positive integer', + positiveInteger: 'Positive Integer', // 参数收集开始 MaintainConfigureInfo: 'Maintain configuration Information', ParameteItemCollectionList: 'Parameter item collection list', @@ -826,11 +826,11 @@ module.exports = { terminationProcessing: 'Termination process', publishComment: 'Publish Comment', record: 'Record', - replyToComments: 'Reply to comments', - noComment: 'No comment', + replyToComments: 'Reply To Comments', + noComment: 'No Comment', theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of All data are received', - notEvaluated: 'Not evaluated', - cannotExceed: 'Cannot exceed', + notEvaluated: 'Not Evaluated', + cannotExceed: 'Cannot Exceed', Characters: 'Characters', standardInformation: 'Standard Information', VirtualList: 'VirtualList', @@ -845,17 +845,17 @@ module.exports = { answer: 'Answer', distributionEngineer: 'Distribution Engineer', reminderHandling: 'Reminder handling', - addFeedback: 'Add feedback', + addFeedback: 'Add Feedback', engineer: 'Engineer', - engineeringConfirmationDetails: 'Engineering confirmation details', + engineeringConfirmationDetails: 'Engineering Confirmation Details', reminder: 'Reminder', adopt: 'Adopt', reviewedByThePersonInCharge: 'Reviewed by the person in charge', onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted', - experimentPassed: 'Test passed', - experimentFailed: 'Test failed', - toBeStarted: 'Not start', - inProgress: 'In progress', + experimentPassed: 'Test Passed', + experimentFailed: 'Test Failed', + toBeStarted: 'Not Start', + inProgress: 'In Progress', green: 'Green', red: 'Red', blue: 'Blue', @@ -864,17 +864,17 @@ module.exports = { TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data', number: 'No.', Deadline: 'Deadline', - toBeConfirmed: 'To confirm', + toBeConfirmed: 'To Confirm', designComplianceReview: 'Design Compliance Confirmation', - preHomeConfirmation: 'Pre-Homo confirmation', + preHomeConfirmation: 'Pre-Homo Confirmation', verificationComplianceReview: 'Validation Compliance Confirmation', Deployment: 'Deploy', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', pleaseConformityVerification: 'Please complete the data of Conformity verification', - virtualListDetails: 'Virtual list details', - maintainVirtualList: 'Maintain virtual list', - reasonsForRejection: 'Reasons for rejection', + virtualListDetails: 'Virtual List Details', + maintainVirtualList: 'Maintain Virtual List', + reasonsForRejection: 'Reasons For Rejection', inconformity: 'Non-Compliance', toTrack: 'To be tracked', Launch: 'Launch', @@ -886,9 +886,9 @@ module.exports = { authenticationMessage: 'Homo Parameter Task', taskRegulationComplianceTask: 'Regulation Compliance Task', accept: 'Accept', - notLaunch: 'Not start', + notLaunch: 'Not Start', refuse: 'Reject', - taskTermination: 'Task termination', + taskTermination: 'Task Termination', projectStatusAndProgress: 'Project status and progress', listConfirmationProgress: 'List Confirmation Progress', taskConfirmationProgress: 'Task Confirmation Progress', @@ -898,7 +898,7 @@ module.exports = { totalTable: 'Total', newlyAdded: 'Add', applicableSupplement: 'Applicable Supplement', - taskDescription: 'Task description', + taskDescription: 'Task Description', descriptionDeliverables: 'Instruction', startMonth: 'Start Month', endMonth: 'End Month', @@ -912,7 +912,7 @@ module.exports = { complianceResults: 'Compliance results', noData: 'No data', confirmOperation: 'Confirm Operation', - sponsorReview: 'Sponsor review', + sponsorReview: 'Sponsor Review', fillInProjectDelivery: 'Fill in project delivery', Resubmit: 'Resubmit', Quantity: 'Quantity', @@ -941,7 +941,7 @@ module.exports = { monthlyReportRegulations: 'Regulation Monthly Report', Pending: 'Pending', custom: 'Custom', - notSelected: 'Not selected', + notSelected: 'Not Selected', ExportReport: 'Export Report', basicInformation: 'Basic Information', replyFromProjectContact: 'Reply from project contact person', @@ -965,53 +965,53 @@ module.exports = { and: 'and', judge: 'Judge', pleaseWaitWhileRunning: 'Please wait while running', - roleSwitching: 'Role switching', + roleSwitching: 'Role Switching', setCreator: 'Set Creator', documentLibraryDetails: 'Document library details', question: 'Question', ConfirmQuestion: 'Confirm Question', - disableInput: 'Disable input', + disableInput: 'Disable Input', taskConfirmationDeadline: 'Task Confirmation Deadline', OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', taskConfirmationResponsiblePerson:'Task confirmation of responsible person', or: 'or', - warningTime: 'Warning time', + warningTime: 'Warning Time', RegulationMonthlyManagement: 'Regulation Monthly Management', RegulationMonthlyFill: 'Regulation Monthly Fill', RegulationMonthlyName: 'Regulation monthly name', - monthlyLanguage: 'Monthly language', - releaseStatus: 'Release status', - uploadedBy: 'Uploaded by', - uploadMonthly: 'Upload monthly', - chapterContents: 'Chapter contents', - chineseTitle: 'Chinese title', - englishTitle: 'English title', - regulatoryContact: 'Regulatory contact', - exportStatus: 'Export status', - monthlyTitleTemplate: 'Monthly title template', + monthlyLanguage: 'Monthly Language', + releaseStatus: 'Release Status', + uploadedBy: 'Uploaded By', + uploadMonthly: 'Upload Monthly', + chapterContents: 'Chapter Contents', + chineseTitle: 'Chinese Title', + englishTitle: 'English Title', + regulatoryContact: 'Regulatory Contact', + exportStatus: 'Export Status', + monthlyTitleTemplate: 'Monthly Title Template', monthlyIntegrationAndExport: 'Monthly integration and export', - addContent: 'Add content', - editContent: 'Edit content', - viewContent: 'View content', + addContent: 'Add Content', + editContent: 'Edit Content', + viewContent: 'View Content', fillInTheMonth: 'Fill in the month', - monthSelection: 'Month selection', + monthSelection: 'Month Selection', bringInStandardInformation: 'Bring in standard Information', - contentTemplate: 'Content template', - moveUp: 'Move up', - moveDown: 'Move down', + contentTemplate: 'Content Template', + moveUp: 'Move Up', + moveDown: 'Move Down', vehicleType: 'Vehicle Type', usage: 'Usage', - implementationModel: 'Implementation model', - primaryCoverageCn: 'Primary coverage (Cn)', - primaryCoverageEn: 'Primary coverage (En)', - workProgressCn: 'NIO Work progress (Cn)', - workProgressEn: 'NIO Work progress (En)', + implementationModel: 'Implementation Model', + primaryCoverageCn: 'Primary Coverage (Cn)', + primaryCoverageEn: 'Primary Coverage (En)', + workProgressCn: 'NIO Work Progress (Cn)', + workProgressEn: 'NIO Work Progress (En)', initiatingProcess: 'Initiating Process', - collectResults: 'Collect results', + collectResults: 'Collect Results', dateOfInitiation: 'Date of initiation', - closingDate: 'Closing date', - viewProcess: 'View process', - evaluationResults: 'Evaluation results', + closingDate: 'Closing Date', + viewProcess: 'View Process', + evaluationResults: 'Evaluation Results', Assessor: 'Assessor', collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions', collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process', @@ -1030,7 +1030,7 @@ module.exports = { implemenDate: 'Implementation Date', // 上报库 Enable: 'Enable', - Latestupdatetime: 'Latest update time', + Latestupdatetime: 'Latest Update Time', Exporthistory: 'Exporthistory', Exporttype: 'Export Type', Exporttime: 'Export Time', @@ -1056,11 +1056,11 @@ module.exports = { NcontrolAlternatives: 'Control Values', NattachmentTemplate: 'File Template', Ntext: 'Text', - NDropdownradio: 'Pull single', - NDropdownmultipleselection: 'Pull more', + NDropdownradio: 'Pull Single', + NDropdownmultipleselection: 'Pull More', Nenclosure: 'File', - Atext: 'Text+Pull single', - Btext: 'Text+Pull more', + Atext: 'Text+Pull Single', + Btext: 'Text+Pull More', Ctext: 'Text+File', Dtext: 'Pull single+File', Etext: 'Pull more+File', @@ -1068,14 +1068,14 @@ module.exports = { Nnothing: 'Null', Nchinese: 'Chinese', NpositiveInteger: 'Integer', - NPositivefloatingpointnumber: 'Positive float', - NintegerOrDecimal: 'Integer decimal', - NOneDecimalPlace: 'Decimal one', - NTwoDecimalplaces: 'Decimal two', - NThreedecimalplaces: 'Decimal three', - NFourDecimalplaces: 'Decimal four', + NPositivefloatingpointnumber: 'Positive Float', + NintegerOrDecimal: 'Integer Decimal', + NOneDecimalPlace: 'Decimal One', + NTwoDecimalplaces: 'Decimal Two', + NThreedecimalplaces: 'Decimal Three', + NFourDecimalplaces: 'Decimal Four', yes: 'Yes', - Copyparameterlist: 'Copy parameter list', + Copyparameterlist: 'Copy Parameter List', Templatenamelist: 'Template name - parameter item collection list', newNiONumber: 'Number', English: 'English', @@ -1087,7 +1087,7 @@ module.exports = { theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank', bringInTheProjectInterface:'Bring in the project interface', theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved', - defaultTemplate:'Default template', + defaultTemplate:'Default Template', newRequestCommentListTemplate:'New request for comment list template', NewReleasedStandardTemplate:'New released standard template', pleaseSelectStandard:'Please select a standard', @@ -1095,7 +1095,7 @@ module.exports = { theDeadlineEmpty:'The deadline of cannot be empty', theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty', For:'For', - markedRejection:'Marked rejection', + markedRejection:'Marked Rejection', RegulationListConfirmationTask:'Regulation List Confirmation Task', RegulationListConfirmationNotification:'Regulation List Confirmation Notification', RegulationTaskConfirmation:'Regulation Task Confirmation', From e44d653e5b35e34e7378b86f4fabb7c6b63d4c5b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 13:49:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 37 +++++++++++- .../splitting/modules/SplitAddForm.vue | 59 +++++++++++-------- .../splitting/modules/SplitDetail.vue | 42 +++++++------ 3 files changed, 91 insertions(+), 47 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index b9ecf2551..a5ed87aac 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -142,7 +142,40 @@ .itemModel-multi .ant-form-explain, .ant-form-extra { margin-top: -10px; } - .anticon-exclamation-circle{ - display: none!important; + + + .anticon-exclamation-circle { + display: none !important; + } + + .ant-select-selection--single { + height: 38px !important; + } + + .ant-select-selection--multiple { + height: 38px !important; + } + + .ant-select-selection__rendered { + line-height: 38px !important; + height: 38px !important; + } + + .ant-select-selection--multiple .ant-select-selection__rendered > ul > li { + margin-top: 6px; + } + + .ant-calendar-picker { + line-height: 38px !important; + height: 38px !important; + } + + .ant-calendar-picker-input { + height: 38px !important; + } + + .ant-input-number-input-wrap { + line-height: 38px !important; + height: 38px !important; } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 894f071fe..445772922 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -10,6 +10,8 @@ @close="onClose" width="900" > + + @@ -184,6 +184,7 @@ @@ -191,7 +192,7 @@ -
+
* {{item.db_field_txt}} @@ -200,6 +201,7 @@
- @@ -278,10 +279,9 @@ @@ -303,7 +303,7 @@ - + @@ -333,12 +333,12 @@ > - + - + @@ -1214,7 +1214,6 @@ margin-top: 2px; } - } .con-divider{ font-size: 16px; @@ -1310,8 +1309,21 @@ text-align: center; img{ } - } + .box-input { + /*min-width: 200px;*/ + display: inline-block; + height: 38px; + margin-top: 2px; + } + .button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 881792170..4768352b0 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -1170,17 +1170,18 @@ @import '~@assets/less/common.less'; .split-detail { - height: 100% !important; + /*height: 100% !important;*/ .split-detail-wrap { - display: flex; - justify-content: space-between; + /*display: flex;*/ + /*justify-content: space-between;*/ .split-detail-left { - height: 100%; - min-width: 300px; + /*height: 100%;*/ + width: 300px; + float: left; padding-right: 20px; - border-right: 1px solid #E6E7EC; + /*border-right: 1px solid #E6E7EC;*/ overflow-y: auto; .split-detail-left-tree { @@ -1206,7 +1207,10 @@ .split-detail-right { padding-left: 20px; - flex: 1; + width: calc(100% - 300px); + float: right; + border-left: 1px solid #E6E7EC; + /*flex: 1;*/ .split-detail-search-header { margin-bottom: 20px; @@ -1385,22 +1389,22 @@ min-width: 73px !important; } - .split-detail-wrap { - height: 481px !important; - } + /*.split-detail-wrap {*/ + /* height: 481px !important;*/ + /*}*/ - .mainItem { - height: 500px; - } + /*.mainItem {*/ + /* height: 500px;*/ + /*}*/ } @media screen and (min-width: 1600px) and (max-width: 2000px) { - .split-detail .split-detail-wrap .split-detail-left { - height: 735px !important; - } + /*.split-detail .split-detail-wrap .split-detail-left {*/ + /* height: 735px !important;*/ + /*}*/ - .mainItem { - height: 800px !important; - } + /*.mainItem {*/ + /* height: 800px !important;*/ + /*}*/ } \ No newline at end of file From 181c04410cd8411419fc75288d1b5aeddf7bd8b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 14:11:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ReferenceParameter/index.vue | 26 +++++++++---------- .../splitting/modules/SplitAddForm.vue | 2 +- .../splitting/modules/SplitDetail.vue | 6 ++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index cdcc74cde..e2ab3ca03 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -327,19 +327,6 @@ height: 40px; margin-bottom: 24px; } - - + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 445772922..5c9a49c3b 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -287,7 +287,7 @@ >
- {{$t('text')}} + {{$t('text')}} {{$t('picture')}} {{$t('table')}}
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 4768352b0..cd1553cc5 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -1385,9 +1385,9 @@ margin-right: 20px !important; } - .title-text { - min-width: 73px !important; - } + /*.title-text {*/ + /* min-width: 73px !important;*/ + /*}*/ /*.split-detail-wrap {*/ /* height: 481px !important;*/