From ca0e81a9c079a752cd5dc51d987804b1c0d048a8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 10 Mar 2022 19:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=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 | 244 +++++++++--------- jero-web/src/common/lang/zh-cn.js | 5 +- .../src/components/libraryAddForm/index.vue | 28 +- .../src/components/tools/HeaderNotice.vue | 1 + jero-web/src/components/uploadFile/file.vue | 31 +-- jero-web/src/utils/request.js | 36 ++- .../components/DocumentLibrary.vue | 126 ++++++++- 7 files changed, 293 insertions(+), 178 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d3cbda374..0c47ae9f5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -399,7 +399,7 @@ module.exports = { DropDownType: 'Drop down type', ExhibitionAreaManagement: 'Exhibition area management', NewLabelItem: 'Add label item', - editLabelItem:'Edit label item', + editLabelItem: 'Edit label item', NodeQuickLookup: 'Node quick lookup', AreAllLabelsRead: 'Are all labels read', AllLabelsRead: 'labels read', @@ -410,128 +410,130 @@ module.exports = { MessageContent: 'Message Content', MessageType: 'Message Type', NotificationTime: 'Notification Time', - MessageNotification:'Message Notification', - SeeMore:'See more', - OperationSuccessful:'Operation successful', - operationFailed:'operation failed', - PersonnelSelection:'Personnel selection', - EmployeeNumber:'Employee number', - EmployeeType:'Employee type', - LabeItemName:'Label item name', - PleaseEnterLabelName:'Please enter label name', - DisplayArea:'Display area', - ChineseName:'Chinese name', - AttributeType:'Attribute type', - FieldLength:'Field length', - DisplayOrder:'Display order', - LabelName:'Label name', - LabelType:'Label type', - PleaseSelectLabelType:'Please select a label type', - PleaseEnterDescription:'Please enter a description', - LengthBe1to100:'Length should be 1 to 100', - Module:'Module', - PleaseSelectModule:'Please select the module', - AttributeName:'Attribute name', - PleaseEnterPropertyName:'Please enter a property name', - PleaseEnterYourEnglishName:'Please enter your English name', - PleaseSelectAttributeType:'Please select an attribute type', - OptionContent:'Option content', - PleaseSelectOptionContent:'Please select the option content', - PleaseEnterFieldLength:'Please enter the field length', - DisplayOrder:'Display order', - PleaseEnterDisplayOrder:'Please enter the display order', - Required:'Required', - DocumentLibraryModuleDisplay:'Document library module display', - DocumentLibraryListDisplay:'Document library list display', - SelectWhetherDisplayList:'Please select whether to display the document library list', - SelectDisplayArea:'Please select a display area', - Search:'Search', - SelectWhetherToSearch:'Please select whether to search', - DisplayOtherModules:'Display of other modules', - RegulationsListDisplay:'Regulations list display', - selectDisplayListRegulations:'Please select whether to display the list of regulations', - SearchCenterDisplay:'Search center display', - selectSearchCenterDisplayed:'Please select whether the search center is displayed', - selectWhetherRequired:'Please select whether it is required', - SortNumber:'Sort number', - enterDisplayArea:'Please enter the display area', - charactersLength:'1 - 50 characters in length', - enterSortingNumber:'Please enter the sorting number', - ParentName:'Parent name', - charactersLength130:'1 - 30 characters in length', - charactersLength1to300 :'1 - 300 characters in length', - OnlyOneSelected:'Only one piece of data can be selected', - OnlyPDF:'Only PDF files can be imported', - open:'open', - away:'away', + MessageNotification: 'Message Notification', + SeeMore: 'See more', + OperationSuccessful: 'Operation successful', + operationFailed: 'operation failed', + PersonnelSelection: 'Personnel selection', + EmployeeNumber: 'Employee number', + EmployeeType: 'Employee type', + LabeItemName: 'Label item name', + PleaseEnterLabelName: 'Please enter label name', + DisplayArea: 'Display area', + ChineseName: 'Chinese name', + AttributeType: 'Attribute type', + FieldLength: 'Field length', + DisplayOrder: 'Display order', + LabelName: 'Label name', + LabelType: 'Label type', + PleaseSelectLabelType: 'Please select a label type', + PleaseEnterDescription: 'Please enter a description', + LengthBe1to100: 'Length should be 1 to 100', + Module: 'Module', + PleaseSelectModule: 'Please select the module', + AttributeName: 'Attribute name', + PleaseEnterPropertyName: 'Please enter a property name', + PleaseEnterYourEnglishName: 'Please enter your English name', + PleaseSelectAttributeType: 'Please select an attribute type', + OptionContent: 'Option content', + PleaseSelectOptionContent: 'Please select the option content', + PleaseEnterFieldLength: 'Please enter the field length', + DisplayOrder: 'Display order', + PleaseEnterDisplayOrder: 'Please enter the display order', + Required: 'Required', + DocumentLibraryModuleDisplay: 'Document library module display', + DocumentLibraryListDisplay: 'Document library list display', + SelectWhetherDisplayList: 'Please select whether to display the document library list', + SelectDisplayArea: 'Please select a display area', + Search: 'Search', + SelectWhetherToSearch: 'Please select whether to search', + DisplayOtherModules: 'Display of other modules', + RegulationsListDisplay: 'Regulations list display', + selectDisplayListRegulations: 'Please select whether to display the list of regulations', + SearchCenterDisplay: 'Search center display', + selectSearchCenterDisplayed: 'Please select whether the search center is displayed', + selectWhetherRequired: 'Please select whether it is required', + SortNumber: 'Sort number', + enterDisplayArea: 'Please enter the display area', + charactersLength: '1 - 50 characters in length', + enterSortingNumber: 'Please enter the sorting number', + ParentName: 'Parent name', + charactersLength130: '1 - 30 characters in length', + charactersLength1to300: '1 - 300 characters in length', + OnlyOneSelected: 'Only one piece of data can be selected', + OnlyPDF: 'Only PDF files can be imported', + open: 'open', + away: 'away', toDoProcess: 'To Do List', processDone: 'Process done', sentProcess: 'Sent process', monitoringProcess: 'Monitoring process', - ConfirmDeployment:'Confirm deployment?', - terminationProcess:'termination process', - issue:'issue', - projectInformation:'project information', - standardContent:'standard content', - complianceReview:'compliance review', - reviewResults:'review results', - selectReviewResult:'Please select the review result', - feedback:'feedback', - approvalHistory:'cpproval history', - cannotExceed500characters:'cannot exceed 500 characters', - accord:'conformity', - nonConformity:'non conformity', - Tracked:'to be tracked', - notInvolved:'Not involved', - Operator:'operator', - role:'role', - operationContent:'operation content', - operationTime:'operation time', - ConfirmReplication:'Confirm replication', - ProcessName:'Process name', - ProcessType:'Process type', - AddProcess:'Add process', - RelatedItems:'Related items', - Sponsor:'Sponsor', - CurrentProcessor:'Current processor', - LastProcessor:'Last processor', - ProcessingTime:'Processing time', - cutoffTime:'cut-off time', - ProcessStatus:'Process status', - CompletionTime:'Completion time', - draft:'draft', - CannotExceed100characters:'cannot exceed 100 characters', - cantExeed:'cannot exceed ', - characters:' characters', - Processing:'Processing', - See:'See', - labelNameCannotDuplicate:'Label name cannot be duplicate', - list:'list', - paragraph:'paragraph', - enterNumber:'please enter the number', - enterTitle:'Please enter a title', - backDocument:'back to document library', - fileName:'file name', - splitTime:'split time', - splitResult:'split result', - collectionTime:'collection time', - split:'split', - splitFile:'split file', - clauseName:'clause name', - clauseContent:'clause content', - newClause:'new clause', - clauseNo:'clause No.', - functionalAreas:'functional areas', - technicalField:'technical field', - informationCategory:'information category', - contentValidity:'content validity', - content:'content', - Add:'add', - subscriptionTime:'subscription time', - confirmBulkUnsubscribe:'Confirm bulk unsubscribe?', - BatchCancelCollection:'Confirm batch cancel collection?', - unsubscribeConfirm:'unsubscribe confirm?', - confirmCancelCollection:'confirm to cancel collection?', - - theRelease:'The release date should not exceed the standard implementation date' + ConfirmDeployment: 'Confirm deployment?', + terminationProcess: 'termination process', + issue: 'issue', + projectInformation: 'project information', + standardContent: 'standard content', + complianceReview: 'compliance review', + reviewResults: 'review results', + selectReviewResult: 'Please select the review result', + feedback: 'feedback', + approvalHistory: 'cpproval history', + cannotExceed500characters: 'cannot exceed 500 characters', + accord: 'conformity', + nonConformity: 'non conformity', + Tracked: 'to be tracked', + notInvolved: 'Not involved', + Operator: 'operator', + role: 'role', + operationContent: 'operation content', + operationTime: 'operation time', + ConfirmReplication: 'Confirm replication', + ProcessName: 'Process name', + ProcessType: 'Process type', + AddProcess: 'Add process', + RelatedItems: 'Related items', + Sponsor: 'Sponsor', + CurrentProcessor: 'Current processor', + LastProcessor: 'Last processor', + ProcessingTime: 'Processing time', + cutoffTime: 'cut-off time', + ProcessStatus: 'Process status', + CompletionTime: 'Completion time', + draft: 'draft', + CannotExceed100characters: 'cannot exceed 100 characters', + cantExeed: 'cannot exceed ', + characters: ' characters', + Processing: 'Processing', + See: 'See', + labelNameCannotDuplicate: 'Label name cannot be duplicate', + list: 'list', + paragraph: 'paragraph', + enterNumber: 'please enter the number', + enterTitle: 'Please enter a title', + backDocument: 'back to document library', + fileName: 'file name', + splitTime: 'split time', + splitResult: 'split result', + collectionTime: 'collection time', + split: 'split', + splitFile: 'split file', + clauseName: 'clause name', + clauseContent: 'clause content', + newClause: 'new clause', + clauseNo: 'clause No.', + functionalAreas: 'functional areas', + technicalField: 'technical field', + informationCategory: 'information category', + contentValidity: 'content validity', + content: 'content', + Add: 'add', + subscriptionTime: 'subscription time', + confirmBulkUnsubscribe: 'Confirm bulk unsubscribe?', + BatchCancelCollection: 'Confirm batch cancel collection?', + unsubscribeConfirm: 'unsubscribe confirm?', + confirmCancelCollection: 'confirm to cancel collection?', + theRelease: 'The release date should not exceed the standard implementation date', + zoneOfApplication: 'zone of application', + releaseTime: 'release Time', + standardImplementationTime: 'Standard implementation time' } \ 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 908ba7a4a..3654039b4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -536,5 +536,8 @@ module.exports = { BatchCancelCollection:'确认批量取消收藏?', unsubscribeConfirm:'确认取消订阅?', confirmCancelCollection:'确认取消收藏?', - theRelease:'发布日期不能大于标准实施日期' + theRelease:'发布日期不能大于标准实施日期', + zoneOfApplication:'适用地区', + releaseTime:'发布时间', + standardImplementationTime:'标准实施时间', } \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 8eeb7a729..315e800fc 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -11,7 +11,7 @@
- * + * {{item.db_field_txt}}
@@ -26,7 +26,7 @@
- * + * {{item.db_field_txt}}
@@ -41,7 +41,7 @@
- * + * {{item.db_field_txt}}
@@ -58,7 +58,7 @@
- * + * {{item.db_field_txt}}
@@ -73,7 +73,7 @@
- * + * {{item.db_field_txt}}
@@ -91,7 +91,7 @@
- * + * {{item.db_field_txt}}
@@ -106,7 +106,7 @@
- * + * {{item.db_field_txt}}
@@ -126,7 +126,7 @@
- * + * {{item.db_field_txt}}
@@ -141,7 +141,7 @@
- * + * {{item.db_field_txt}}
@@ -155,7 +155,7 @@
- * + * {{item.db_field_txt}}
@@ -171,7 +171,7 @@
- * + * {{item.db_field_txt}}
@@ -187,7 +187,7 @@
- * + * {{item.db_field_txt}}
@@ -206,7 +206,7 @@
- * + * {{item.db_field_txt}}
@@ -373,7 +373,7 @@ let rules = {} this.ruleList.forEach((res, index) => { const rule = [] - if (res.field_must_input == 0) { + if (res.field_must_input == 1) { if (res.field_show_type === '1') { rule.push({ required: true, diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index c4cdb7e08..ff05cf345 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -158,6 +158,7 @@ this.reconnect() }, websocketOnmessage: function(e) { + console.log(e) console.log('-----接收消息-------', e.data) var data = eval('(' + e.data + ')') //解析对象 if (data.cmd == 'topic') { diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 8f1ef9baf..a14632b2c 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -15,7 +15,7 @@ :remove='remove' @change="handleChange">

- +

{{this.$t('clickUpload')}}

@@ -65,6 +65,7 @@ } }, beforeUpload(file) { + console.log(file) // let thisFileType = this.thisFileType.replace(/\s+/g, ""); this.fileTypeSatus = true @@ -92,29 +93,6 @@ remove() { this.fileTypeSatus = true }, - mydownload(item) { - var fileName = item.fileName - downFile(this.downLoadFileUrl + '/' + item.ext1, {}).then((data) => { - if (!data) { - this.$message.destroy() - this.$message.warning('文件下载失败') - return - } - if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName) - } else { - let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' })) - let link = document.createElement('a') - link.style.display = 'none' - link.href = url - link.setAttribute('download', fileName) - document.body.appendChild(link) - link.click() - document.body.removeChild(link) //下载完成移除元素 - window.URL.revokeObjectURL(url) //释放掉blob对象 - } - }) - }, mypreview(item) { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) window.open(url, '_blank') @@ -221,4 +199,9 @@ .ant-upload-list-item-name { color: rgba(0, 0, 0, 0.65) !important; } + + .action-upload { + font-size: 67px; + color: #c0c4cc; + } \ No newline at end of file diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index 0bbf300cc..8bf54a2e4 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -72,14 +72,36 @@ const err = (error) => { notification.error({ message: '系统提示', description: '网络超时' }) break case 401: - notification.error({ message: '系统提示', description: '未授权，请重新登录', duration: 4 }) - if (token) { - store.dispatch('Logout').then(() => { - setTimeout(() => { - window.location.reload() - }, 1500) + if (token && data.message.includes('Token失效')) { + Modal.error({ + title: '登录已过期', + content: '很抱歉，登录已过期，请重新登录', + okText: '重新登录', + mask: false, + onOk: () => { + store.dispatch('Logout').then(() => { + Vue.ls.remove(ACCESS_TOKEN) + try { + let path = window.document.location.pathname + console.log('location pathname -> ' + path) + if (path != '/' && path.indexOf('/user/login') == -1) { + window.location.reload() + } + } catch (e) { + window.location.reload() + } + }) + } }) } + // notification.error({ message: '系统提示', description: '未授权，请重新登录', duration: 4 }) + // if (token) { + // store.dispatch('Logout').then(() => { + // setTimeout(() => { + // window.location.reload() + // }, 1500) + // }) + // } break default: notification.error({ @@ -121,7 +143,7 @@ service.interceptors.request.use(config => { ...config.params } } - } else if((config.method == 'post')) { + } else if ((config.method == 'post')) { config.data = { cut: cut, ...config.data diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index c36392537..8a1aba421 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -40,11 +40,21 @@ ref="table" size="middle" bordered + :scroll="{x: true}" rowKey="id" :data-source="tableData" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + + {{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}} + + + {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} + + {{$t('Push')}} + @@ -85,12 +95,22 @@
+
+ \ No newline at end of file