diff --git a/jero-web/src/views/documentManage/ocr/OcrSplit.vue b/jero-web/src/views/documentManage/ocr/OcrSplit.vue index f38d65e9f..3d7e1cfd6 100644 --- a/jero-web/src/views/documentManage/ocr/OcrSplit.vue +++ b/jero-web/src/views/documentManage/ocr/OcrSplit.vue @@ -55,7 +55,7 @@ var xhr = new XMLHttpRequest(); let fileName= this.$route.query.fileName // xhr.open("GET", 'http://10.0.1.31:8080/jero-boot/ocr/pageOffice/word'); - xhr.open("GET", 'http://10.0.1.25:8080/jero-boot/ocr/ocrCheck/editorFile?fileName='+fileName); + xhr.open("GET", '/jero-boot/ocr/ocrCheck/editorFile?fileName='+fileName); xhr.responseType = "blob"; headers.forEach((header) => { xhr.setRequestHeader(header[0], header[1]); diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue index c00ebfb4d..8fb89db92 100644 --- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue @@ -128,7 +128,8 @@ }, rowId:'', rows:[], - type:'pdf' + type:'pdf', + flag:false } }, mounted() { @@ -215,16 +216,22 @@ // }else if(file.text_info=='相关资料'){ // params.fileType='6' // } - postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') - this.visible = false; - this.$emit('visible',false) - } else { - this.$message.warning(this.$t('operationFailed')) - } - }) + + if(!this.flag){ + this.flag=true + postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + this.visible = false; + this.$emit('visible',false) + } else { + this.$message.warning(this.$t('operationFailed')) + } + }).finally(()=>{ + this.flag=false + }) + } // this.$emit('exportVisible',true) }else{ this.$message.warning(this.$t('OnlyPDF')) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 1afe6010f..17b378282 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -282,6 +282,7 @@ parameter:{}, widthBrown:'', creenWidth: document.body.clientWidth, + brownHeight:document.documentElement.clientHeight, } }, watch:{ @@ -302,9 +303,11 @@ const that = this; let client='' let width='' - this.widthBrown = document.documentElement.offsetWidth || document.body.offsetWidth + this.widthBrown = window.screenWidth || document.body.clientWidth; client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect() width = this.widthBrown - client.left + let iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top + document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px' document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px' window.addEventListener('resize', () => { that.screenWidth = window.screenWidth || document.body.clientWidth; @@ -312,6 +315,8 @@ // console.log('screenWidth',that.screenWidth) width = that.screenWidth - client.left document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px' + iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top + document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px' }, false); @@ -1131,6 +1136,7 @@ padding-right: 20px; border-right: 1px solid #E6E7EC; + overflow-y: auto; .split-detail-left-tree{ } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index 6d6bfed3f..85bccf04f 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -20,7 +20,7 @@
- {{$t('fileType')}} + *{{$t('fileType')}} GSO @@ -291,6 +291,14 @@ line-height: 32px; display: inline-block; margin-right: 16px; + .operator-i{ + display: inline-block; + width: 10px; + height: 38px; + line-height: 38px; + text-align: center; + color:#f5222d; + } } .operator-select-type{ display: flex; diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index d30faa250..58f4608ec 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -275,11 +275,13 @@ this.key=value if(value==1){ this.submitKey='1' + this.queryParam.pageNo=1 this.loadData(1) // this.tableData=this.taglab // this.tableData=this.taglabSplit }else if(value==2){ this.submitKey='2' + this.queryParam.pageNo=1 this.loadData(0) } },