Merge remote-tracking branch 'origin/master'

jero-web/src/config/router.config.js

@@ -342,6 +342,11 @@ export const constantRouterMap = [
     name: 'processIndex',
     component: () => import(/* webpackChunkName: "process" */ '@/views/documentManage/process/detail')
   },
+  {
+    path: '/ocr/ocrSplit',
+    name: 'ocrSplit',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/documentManage/ocr/OcrSplit')
+  },
   // {
   //   path: '/',
   //   name: 'index',

jero-web/src/views/documentManage/ocr/OcrSplit.vue

@@ -1,12 +1,14 @@
 <template>
-  <iframe id="iframe" ref="iframe" frameborder="0" :style="'width:100%;height:'+iframeHeight+'px'"></iframe>
+ <a-card>
+   <iframe id="iframe" ref="iframe" frameborder="0" :style="'width:100%;height:'+iframeHeight+'px'"></iframe>
+ </a-card>
 </template>
 
 <script>
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import Vue from 'vue'
   export default {
-    name: 'ocrSplit',
+    name: 'OcrSplit',
     data(){
        return{
          token:Vue.ls.get(ACCESS_TOKEN),
@@ -23,11 +25,11 @@
     },
     mounted() {
       this.iframeTop=this.$refs.iframe.getBoundingClientRect().top
-      this.iframeHeight=this.brownHeight-this.iframeTop-10
+      this.iframeHeight=this.brownHeight-this.iframeTop-24
       window.addEventListener('resize', () => {
         let brownHeight=document.documentElement.clientHeight
         let iframeTop=this.$refs.iframe.getBoundingClientRect().top
-        this.iframeHeight=brownHeight-iframeTop-10
+        this.iframeHeight=brownHeight-iframeTop-24
         // console.log('iframeTop',this.iframeHeight,this.brownHeight)
       }, false);
       setTimeout(() => {

jero-web/src/views/documentManage/ocr/index.vue

@@ -307,7 +307,14 @@
       },
       //校核
       actionCheck(val){
-        this.checkVisible=true
+        // this.checkVisible=true
+        let newUrl = this.$router.resolve({
+          path: '/ocr/ocrSplit',
+        })
+        // this.$router.push({
+        //     path:'/ocr/ocrSplit'
+        // })
+        window.open(newUrl.href, '_blank')
       },
       //下载
       actionDown(val){
@@ -395,10 +402,14 @@
       },
       //校核确认
       handleOkCheck(){
-        this.$router.push({
-            path:'/ocr/ocrSplit'
+        let newUrl = this.$router.resolve({
+          path: '/ocr/ocrSplit',
         })
-        this.checkVisible=false
+        // this.$router.push({
+        //     path:'/ocr/ocrSplit'
+        // })
+        window.open(newUrl.href, '_blank')
+        // this.checkVisible=false
       },
       //校核取消
       handleCancelCheck(){