From d697908c8c5410de0b6b90dff0904a80919afcd2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 09:35:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/whole.vue | 35 +++++++++++++------ .../src/views/system/UserAnnouncementList.vue | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index e74325c77..58f5f365c 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -11,31 +11,32 @@
- + - + - + - + - + - - + + - + @@ -158,7 +159,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32)+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix) window.open(url, '_blank') @@ -260,17 +261,29 @@ .text-header { margin-bottom: 11px; - span { + .text-header-text { margin-right: 52px; font-size: 16px; font-weight: bold; color: #040B29; display: inline-block; - max-width: 500px; + max-width: 180px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; } + + /*span {*/ + /* margin-right: 52px;*/ + /* font-size: 16px;*/ + /* font-weight: bold;*/ + /* color: #040B29;*/ + /* display: inline-block;*/ + /* max-width: 500px;*/ + /* text-overflow: ellipsis;*/ + /* white-space: nowrap;*/ + /* overflow: hidden;*/ + /*}*/ } .text-content { diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index 73824c59d..ab48a5967 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -100,12 +100,12 @@ description: '系统通告表管理页面', queryParam: {}, selectedRowKeys: [], + // '5': this.$t('taskRegulationComplianceTask'), msgCategoryQuery: { '1': this.$t('SubscriptionNotification'), '2': this.$t('warningInformation'), '3': this.$t('ForwardPush'), '4': this.$t('authenticationMessage'), - '5': this.$t('taskRegulationComplianceTask'), '6':this.$t('RegulationListConfirmationTask'), '7':this.$t('RegulationListConfirmationNotification'), '8':this.$t('RegulationTaskConfirmation'), From b4b1393d0489e64bbea8c714742e20a3ff274d0d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 14 Jul 2022 11:02:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=A6=E6=83=85--?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=A0=87=E9=A2=98=E5=92=8C=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=90=88=E5=B9=B6=E4=B8=BA=E6=A0=87=E9=A2=98?= =?UTF-8?q?(Title)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3e8e82250..c13922769 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -128,6 +128,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.function.Predicate; import java.util.stream.Collectors; @@ -1001,7 +1002,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -1059,6 +1059,29 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl mapTemp = new HashMap<>(); List> resultTemp = new ArrayList<>(); List fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(cut)){ + fieldListTemp.removeIf(new Predicate() { + @Override + public boolean test(OnlCgformField onlCgformField) { + return onlCgformField.getDbFieldName().equals("title_en");// + } + }); + List collect = fieldListTemp.stream().filter(e -> "title".equals(e.getDbFieldName())).collect(Collectors.toList()); + if(collect.size() != 0){ + collect.get(0).setDbFieldTxt("标题"); + } + }else{ + fieldListTemp.removeIf(new Predicate() { + @Override + public boolean test(OnlCgformField onlCgformField) { + return onlCgformField.getDbFieldName().equals("title");// + } + }); + List collect = fieldListTemp.stream().filter(e -> "title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); + if(collect.size() != 0){ + collect.get(0).setDbFieldEnName("Title"); + } + } for (OnlCgformField onlCgformField : fieldListTemp) { //字段 String dbFieldName = onlCgformField.getDbFieldName();