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(); 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 { + 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) { 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