拆分详情修改

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]);

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) {
+              if(!this.flag){
-                  this.$message.success(this.$t('OperationSuccessful'))
+                this.flag=true
-                  eventBUs.$emit('searchReset')
+                postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => {
-                  this.visible = false;
+                  if (res.success) {
-                  this.$emit('visible',false)
+                    this.$message.success(this.$t('OperationSuccessful'))
-                } else {
+                    eventBUs.$emit('searchReset')
-                  this.$message.warning(this.$t('operationFailed'))
+                    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'))

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{
 
         }

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -20,7 +20,7 @@
 <!--            模板下载-->
 
             <div  class="operator-select-type">
-              <span class="operator-file-type">{{$t('fileType')}}</span>
+              <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
               <a-select  v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
                 <a-select-option value="GSO" key="GSO" title="GSO">
                   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;

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)
         }
       },