From 16c2239f175e6baffe56040994697e9523c5ae1c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 09:47:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 703474c0d..dac938744 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -53,11 +53,14 @@ :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}" class="content-box-box-text content-box-box-text-index" v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0"> - - - - - + + + {{item2.contentFileName}} + + + + {{$t('viewFile')}} @@ -102,6 +105,7 @@ import countryCardViewAdd from './countryCardViewAdd' import viewFileModel from '@/components/viewFileModel/index' import { mapGetters } from 'vuex' + import { Base64 } from 'js-base64' export default { name: 'countryCardView', @@ -122,6 +126,7 @@ countryCardViewList: [], applyMarkets: '', header_text: '', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', url: { list: '/problemKnowledgeBase/countryCardTempEO/list', deleteOne: '' @@ -137,6 +142,25 @@ }, methods: { ...mapGetters(['userInfo']), + pdfPreview(fileQuery) { + let fileName = fileQuery.contentFileName + fileQuery.id = fileQuery.lableName + let index1 = fileName.lastIndexOf('.') + 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+'&userName='+this.userInfo().username)) + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls' + || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', fileQuery.contentFileName, { id: fileQuery.id }) + } + }, displayInformationClick() { this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) }, @@ -149,7 +173,7 @@ this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) + downloadFile('/sys/common/downLoadFile', item.contentFileName, { id: item.lableName, userName: this.userInfo().username }) }, countryCardViewAddForm(val) { this.countryCardViewList = JSON.parse(JSON.stringify(val)) @@ -222,12 +246,14 @@ if (val.lableType == 3) { res1.list.push({ lableName: val.contentDropDownValue, - lableType: val.lableType + lableType: val.lableType, + contentFileName:val.contentFileName || '' }) } else { res1.list.push({ lableName: val.content, - lableType: val.lableType + lableType: val.lableType, + contentFileName:val.contentFileName || '' }) } } @@ -490,6 +516,7 @@ text-overflow: ellipsis; white-space: nowrap; float: left; + color: #040B29 } .icon-text { From c2b79bf730cf5be36edc31a0cc573a42c807c70c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 10:37:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseRelease.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 48dfda617..67a491e01 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -158,13 +158,13 @@ }) }, titleClick(item) { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseView', - query: { - id: item.id - } - }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemKnowledgeBaseView', + // query: { + // id: item.id + // } + // }) + // window.open(newUrl.href, '_blank') }, edit(val) { this.$router.push({ From 6814f4bf70b8c5c79aafcc0cbcfb5a5a36f57a70 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Sep 2022 11:00:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93(=E6=8A=80=E6=9C=AF=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E6=90=9C=E7=B4=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DocumentSearchServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 7bbdfb98d..bcc454663 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -350,11 +350,17 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { String key = entry.getKey(); String value = (String) entry.getValue(); if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ - Map queryMapNew = new HashMap<>(); - Map queryMapTempNew = new HashMap<>(); - queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*"); - queryMapNew.put("wildcard", queryMapTempNew); - must.add(queryMapNew); + JSONArray should = new JSONArray(); + + List> mapList = new ArrayList<>(); + for (String s : value.split(",")) { + Map map = new HashMap(); + map.put(key,"*"+s+"*"); + Map map1 = new HashMap<>(); + map1.put("wildcard",map); + should.add(map1); + } + must.add(should); }else{ Map map = new HashMap<>(); Map queryMap = new HashMap<>();