diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4497b2d83..54b9257fd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -13,7 +13,7 @@ module.exports = { userStatues: 'User Status', normal: 'Normal', frozen: 'Frozen', - reset: 'Reset', + reset: 'Clear', putAway: 'Put Away', open: 'More', addUser: 'Add User', @@ -89,7 +89,7 @@ module.exports = { VersionNotSupported: 'Version Not Supported', SaveQueryCriteria: 'Save Search Conditions', roleName: 'Role Name', - newRole: 'New Role', + newRole: 'Create New Role', RoleManagement: 'Role Management', toGrantAuthorization: 'Authorized', newUser: 'New User', @@ -355,7 +355,7 @@ module.exports = { templateDownload: 'Download Template', textInformation: 'Document Files', relatedInformation: 'Relevant Information', - RetrieveFiles: 'Select Stored File', + RetrieveFiles: 'Retrieve Library File', SplitText: 'Split Library File', ImportResults: 'Import Split Results', copy: 'Copy', @@ -368,7 +368,7 @@ module.exports = { clickUpload: 'Click To Upload', viewUploadedFiles: 'View Uploaded Files', standardSelection: 'Standard Selection', - Collection: 'Add To Collection', + Collection: 'Collect', CancelCollection: 'Delete Collection', deleteLib: 'Delete', subscribe: 'Subscribe', @@ -404,7 +404,7 @@ module.exports = { LabelContentManagement: 'Tag Content Management', InputBoxType: 'Input Box Type', DropDownType: 'Drop Down Type', - ExhibitionAreaManagement: 'Display Area Management', + ExhibitionAreaManagement: 'Display Management', NewLabelItem: 'Newly Added Tag Item', editLabelItem: 'Edit Tag Item', NodeQuickLookup: 'Node Quick Lookup', @@ -471,11 +471,11 @@ module.exports = { charactersLength1to300: '1 - 300 characters in length', OnlyOneSelected: 'Only one piece of data can be selected', OnlyPDF: 'Only PDF files can be imported', - open: 'More', - away: 'Less', + open: 'Expand', + away: 'Collapse', toDoProcess: 'To Do', processDone: 'Completed', - sentProcess: 'Initiated', + sentProcess: 'Create', monitoringProcess: 'Monitor', ConfirmDeployment: 'Confirm Deployment?', terminationProcess: 'Termination Process', @@ -501,10 +501,10 @@ module.exports = { ProcessType: 'Process Type', AddProcess: 'Add Process', RelatedItems: 'Relevant Project', - Sponsor: 'Initiator', + Sponsor: 'Creator', CurrentProcessor: 'Current Processor', LastProcessor: 'Last Processor', - ProcessingTime: 'Operation Time', + ProcessingTime: 'Complete Date', cutoffTime: 'Due Date', ProcessStatus: 'Process Status', CompletionTime: 'Completion Time', @@ -821,8 +821,8 @@ module.exports = { selectInquiry: 'Select Inquiry', sendBack: 'Send Back', taskConfirmationProcess: 'Task confirmation process', - notFinished: 'To be completed', - Finished: 'Completed', + notFinished: 'Assigned', + Finished: 'Complete', theRequirementst: 'The engineering interface person confirms the compliance requirements', dataLoading: 'Data loading...', Submitting: 'Submitting', diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index ffd25c5b7..fcb9059c1 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -281,13 +281,13 @@ }, pageOnChange(page, pageSize) { this.pageNo = page - this.$emit('handlePreservation') + // this.$emit('handlePreservation') this.getTableList() }, SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize - this.$emit('handlePreservation') + // this.$emit('handlePreservation') this.getTableList() }, hideModal(){