From 4cd045abad128f4f57611302f995154fd6ac1238 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 9 Sep 2022 10:24:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug593?= =?UTF-8?q?81:=20=E8=A7=A3=E5=86=B3=E5=8A=A0=E8=BD=BD=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 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 17ef37b88..569e7bd31 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 @@ -3550,7 +3550,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) ? 1 : 0); //总页数 + + // 分页计算 + int fromIndex = (pageNo-1) * subSize; + int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize)); + if( fromIndex <= subCount && toIndex <= subCount) { + records = records.subList(fromIndex, toIndex); + } else { + records = new ArrayList(); + } + //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); From a8d2ea549feefc63a03db59ed119e8056062796e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 9 Sep 2022 10:54:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=20=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsOpinionGatherEOServiceImpl.java | 2 +- .../service/impl/LawsTechnologyEvaluationEOServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 1eb348350..6e51bcfff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -113,7 +113,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl Date: Fri, 9 Sep 2022 11:15:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SplitTable/index.vue | 6 +- .../library/docDetail/index.vue | 65 +++++++++++++++++-- .../views/documentManage/splitting/index.vue | 2 +- .../documentComparison/index.vue | 4 ++ .../components/documentTranslationResults.vue | 16 ++--- .../documentTranslation/index.vue | 9 ++- 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 5b4fbcdeb..baf0b1142 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -134,11 +134,15 @@ this.getData() this.getTableList() }) + if (this.$route.query.serial_number) { + this.searchParmes.serialNumber = this.$route.query.serial_number + this.searchParmes = { ...this.searchParmes } + } this.getData() this.getTableList() this.userData = this.userInfo() }, - beforeDestroy(){ + beforeDestroy() { eventBUs.$off('searchQuery') eventBUs.$off('searchReset') eventBUs.$off('searchGetData') diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index d7ff597ec..45e0b58bf 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -21,20 +21,23 @@ {{$t('UpdateLog')}} -
{{$t('DocumentSplitting')}}
-
+
{{$t('DocumentTranslation')}}
-
+
{{$t('DocumentComparison')}}
-
+
{{$t('KnowledgeDatabase')}}
@@ -357,6 +360,46 @@ }, methods: { ...mapGetters(['userInfo']), + DocumentTranslationClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + let newUrl = this.$router.resolve({ + path: '/documentTranslation', + query: { + serial_number: serial_number + } + }) + window.open(newUrl.href, '_blank') + }, + DocumentComparisonClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + let newUrl = this.$router.resolve({ + path: '/documentComparison', + query: { + serial_number: serial_number + } + }) + window.open(newUrl.href, '_blank') + }, + KnowledgeDatabaseClick() { + let newUrl = this.$router.resolve({ + path: '/problemknowledgeBase', + }) + window.open(newUrl.href, '_blank') + }, getTitle(callback) { let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId getAction(this.url.getTitle, { id: _id }).then((res) => { @@ -459,10 +502,18 @@ this.bussLogList() }, DocumentSplitting() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } let newUrl = this.$router.resolve({ path: '/docManage/splite', query: { - serial_number: this.$route.query.serial_number + serial_number: serial_number } }) window.open(newUrl.href, '_blank') @@ -539,7 +590,7 @@ } .doc-detail-right { - width: 800px; + /*width: 800px;*/ line-height: 68px; display: flex; @@ -642,7 +693,7 @@ font-weight: 400; color: #040B29; display: inline-block; - width: 20%; + width: 100px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 938451ce0..1a861d333 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -137,7 +137,7 @@ }, mounted() { - if (this.$route.query.serial_number !== undefined) { + if (this.$route.query.serial_number) { this.serialnumber = this.$route.query.serial_number } }, diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 93c6ef10e..8347c05b0 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -220,6 +220,10 @@ } }, mounted() { + if (this.$route.query.serial_number) { + this.queryParam.serialNumber = this.$route.query.serial_number + this.queryParam = { ...this.queryParam } + } this.userInfoQuery = this.userInfo() this.getList() }, diff --git a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue index 2125c4ce8..7c6924032 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue @@ -85,16 +85,16 @@ this.loadingRight = true // this.readExcelFromRemoteFileLeft(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) // this.readExcelFromRemoteFileRight(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) - let href = location.href.slice(0, 5) - if (href.indexOf('s') == '-1') { + // let href = location.href.slice(0, 5) + // if (href.indexOf('s') == '-1') { this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) - console.log(this.detailUrlLeft) - } else { - this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) - this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) - console.log(this.detailUrlLeft) - } + // console.log(this.detailUrlLeft) + // } else { + // this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) + // this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) + // console.log(this.detailUrlLeft) + // } }, readExcelFromRemoteFileLeft: function(url) { var vm = this diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 2111503b6..35370e0ee 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -227,6 +227,10 @@ } }, mounted() { + if (this.$route.query.serial_number) { + this.queryParam.serialNumber = this.$route.query.serial_number + this.queryParam = { ...this.queryParam } + } this.getList() this.userInfoQuery = this.userInfo() }, @@ -455,12 +459,13 @@ margin-right: 4px; display: inline-block; } + ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file From 9e31357847ce08b29b492f940923405c7734c868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 9 Sep 2022 11:29:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=A6=81=E6=AD=A2=E7=B2=98=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 27d8c801e..7f7b86022 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -234,6 +234,10 @@ placeholder: '', theme: 'snow', // or 'bubble' modules: { + clipboard: { + // 粘贴版，处理粘贴时候带图片 + matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]] + }, toolbar: { container: toolbarOptions, // 工具栏 handlers: { @@ -338,6 +342,18 @@ quilleditorBlur() { this.$refs.ruleForm.validateField('content') }, + handleCustomMatcher(node, Delta) { + let ops = [] + Delta.ops.forEach(op => { + if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加 + ops.push({ + insert: op.insert + }) + } + }) + Delta.ops = ops + return Delta + }, getBase() { getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { if (res.success) { @@ -445,7 +461,7 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL']+'/sys/common/download/'+file.response.result.id+fileSuffix) + quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix) quill.setSelection(length + 1) this.quillUpdateImg = false } else if (status === 'uploading') { From 98d4cfaa143d197ed5340bd35e5cb2fd5c77d036 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 9 Sep 2022 11:40:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E7=9B=AE=E5=BD=95=E4=B8=8E=E6=AD=A3?= =?UTF-8?q?=E6=96=87=E4=B9=8B=E9=97=B4=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 5067f2c71..f77804cc8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -887,7 +887,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Fri, 9 Sep 2022 11:41:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=A6=81=E6=AD=A2=E7=B2=98=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 7f7b86022..43db4bdfb 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -236,7 +236,7 @@ modules: { clipboard: { // 粘贴版，处理粘贴时候带图片 - matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]] + matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]], }, toolbar: { container: toolbarOptions, // 工具栏 @@ -347,7 +347,7 @@ Delta.ops.forEach(op => { if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加 ops.push({ - insert: op.insert + insert: op.insert, }) } }) @@ -461,7 +461,7 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix) + quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL']+'/sys/common/download/'+file.response.result.id+fileSuffix) quill.setSelection(length + 1) this.quillUpdateImg = false } else if (status === 'uploading') {