From de86b152aed6d236e5f5f31d3b83f4470ee136f1 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Tue, 31 May 2022 13:29:56 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/OcrAddForm/index.vue               | 4 ++--
 jero-web/src/views/documentManage/ocr/modules/DocTable.vue | 7 +++++--
 .../documentManage/splitting/modules/ImportResult.vue      | 4 ++--
 .../views/documentManage/splitting/modules/SplitDetail.vue | 4 +---
 .../views/documentManage/splitting/modules/SplitText.vue   | 3 ++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue
index ee84c9eb9..0ba9cdd50 100644
--- a/jero-web/src/components/OcrAddForm/index.vue
+++ b/jero-web/src/components/OcrAddForm/index.vue
@@ -98,8 +98,8 @@
                           :disabled="disabled"
                           :placeholder="$t('PleaseSelect')+item.db_field_txt">
 
-                  <a-select-option v-for="(element) in item.value_list" :value="element">
-                    {{element}}
+                  <a-select-option v-for="(element,index) in item.value_list" :key="element.value" :value="element.value">
+                    {{element.label}}
                   </a-select-option>
                 </a-select>
               </a-form-model-item>
diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
index 370ad0ec8..af88dd4e1 100644
--- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
@@ -199,10 +199,13 @@
               let params = {
                 attId: file.id,
                 standName: file.title,
+                standNameEn:file.title_en,
                 standNumber: file.serial_number,
-                connectId:file.connect_id
+                connectId:file.connect_id,
+                fileType:file.text_info_id,
+
               }
-              params.fileType=file.text_info
+              // params.fileType=file.text_info
               // if(file.text_info=='发布稿(必读)'){
               //   params.fileType='1'
               // }else if(file.text_info=='增补件(必读)'){
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index e2378b2f0..c9c1a9aaf 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -256,9 +256,9 @@
             fileName:this.rows[0].file_name,
             serialNumber:this.rows[0].serial_number,
             title:this.rows[0].title,
-
+            titleEn:this.rows[0].title_en,
           }
-          params.fileType=this.rows[0].text_info
+          params.fileType=this.rows[0].text_info_id
           params.cut=this.cut
           let formData = new FormData()
           Object.keys(params).forEach((key) => {
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 9f09974e1..73dc421ff 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -305,9 +305,7 @@
       let client=''
       let width=''
       // 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
+y      // let iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
       // document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
       // console.log(iframeTop,'iframeTop2222')
       // document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index 33f9b7d38..7381758b5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -225,11 +225,12 @@
                 let params = {
                   attId: file.id,
                   title: file.title,
+                  titleEn:file.title_en,
                   fileName:file.file_name,
                   serialNumber: file.serial_number,
                   connectId: file.connect_id,
                   fileGroup: this.fileGroup,
-                  fileType:file.text_info
+                  fileType:file.text_info_id
                 }
 
                 if(!this.submitFlag){