From cb423beb9363d76c4a5cb7c8ff8c721f86cca19a Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 2 Mar 2022 14:56:31 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  6 ++++++
 jero-web/src/common/lang/zh-cn.js             |  7 ++++++-
 jero-web/src/components/coTable/index.vue     |  2 +-
 jero-web/src/components/ocrTable/docTable.vue |  2 +-
 .../src/views/documentManage/ocr/index.vue    |  2 +-
 .../documentManage/ocr/modules/docTable.vue   |  4 +++-
 .../documentManage/subscribtion/index.vue     |  2 +-
 .../documentManage/tags/dialog/newDrawer.vue  |  5 ++---
 .../src/views/documentManage/tags/index.vue   | 20 +++++++++----------
 .../documentManage/tags/tabs/tabTable.vue     |  1 -
 .../documentManage/tags/tabs/tagContent.vue   |  2 +-
 .../documentManage/tags/tabs/tagItem.vue      | 16 +++++++--------
 12 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5dc65954f..ab1d80c16 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -393,5 +393,11 @@ module.exports = {
   sureVerified:'Are you sure this file is not verified?',
   sureSynchronize:'The file has not been verified. Are you sure you want to synchronize to the document library?',
   UploadFile:'Upload file',
+  TagItemManagement:'Tag item management',
+  LabelContentManagement:'Label content management',
+  InputBoxType:'Input box type',
+  DropDownType:'Drop down type',
+  ExhibitionAreaManagement:'Exhibition area management',
+  NewLabelItem:'New label item',
 
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 8e4c05afb..ece7144c6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -397,6 +397,11 @@ module.exports = {
   sureVerified:'确定对该文件未进行校验?',
   sureSynchronize:'该文件未进行校验，确定要同步至文档库?',
   UploadFile:'上传文件',
-
+  TagItemManagement:'标签项管理',
+  LabelContentManagement:'标签内容管理',
+  InputBoxType:'输入框类型',
+  DropDownType:'下拉选类型',
+  ExhibitionAreaManagement:'展示区域管理',
+  NewLabelItem:'新增标签项',
 
 }
\ No newline at end of file
diff --git a/jero-web/src/components/coTable/index.vue b/jero-web/src/components/coTable/index.vue
index 5abaf1dc6..c720a7f40 100644
--- a/jero-web/src/components/coTable/index.vue
+++ b/jero-web/src/components/coTable/index.vue
@@ -105,7 +105,7 @@
         var context = canvas.getContext('2d')
         context.font = fontStyle || '14px' // 设置字体样式
         var dimension = context.measureText(text)
-        return dimension.width + 40
+        return dimension.width + 70
       },
       getData() {
         let params = {
diff --git a/jero-web/src/components/ocrTable/docTable.vue b/jero-web/src/components/ocrTable/docTable.vue
index 9d1a0e5b8..03494269c 100644
--- a/jero-web/src/components/ocrTable/docTable.vue
+++ b/jero-web/src/components/ocrTable/docTable.vue
@@ -3,7 +3,7 @@
     <div class="box">
       <a-table
         class="table"
-        :rowKey="(record,index)=>{return index}"
+        rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
         :scroll="{x: true}"
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 563e53e6b..e013cb78c 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -228,7 +228,7 @@
       },
       //下载
       actionDown(val){
-        console.log()
+        // console.log()
         downloadFile('/sys/common/download', val.fileName, { id: val.id })
       },
       //删除
diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
index 852ed2ce8..334ba6ddb 100644
--- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
@@ -35,6 +35,7 @@
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import search from '@/components/search/index'
   import tableData from '@/components/ocrTable/docTable'
+  import eventBUs from '../../../../common/event'
   export default {
     name: 'docTable',
     components:{
@@ -186,7 +187,7 @@
             let nameSuffix=name[name.length-1]
             if(nameSuffix.toLowerCase()=='pdf'){
               let params = {
-                attId: this.rows.connect_id,
+                attId: this.rows.id,
                 standName: this.rows.title,
                 standNumber: this.rows.serial_number
               }
@@ -206,6 +207,7 @@
               postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => {
                 if (res.success) {
                   this.$message.success(res.message)
+                  eventBUs.$emit('searchReset')
                 } else {
                   this.$message.warning(res.message)
                 }
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 753356434..b2d982591 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -152,7 +152,7 @@
         },
         OperationList: [
           {
-            text: '取消订阅',
+            text: this.$t('CancelSubscribe'),
             ClickEvent: 'onCancel'
           }
         ],
diff --git a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue
index bbbaa36fb..ae82b429e 100644
--- a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue
@@ -3,8 +3,8 @@
     <onl-cgform-tag-form  ref="realForm" @ok="submitCallback" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :disabled="disableSubmit" normal> </onl-cgform-tag-form>
 
     <div class="drawer-footer">
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">保存</a-button>
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">{{$t('preservation')}}</a-button>
+      <a-button @click="handleCancel" style="margin-bottom: 0;">{{$t('close')}}</a-button>
     </div>
   </div>
 </template>
@@ -20,7 +20,6 @@
     },
     data () {
       return {
-        title:"操作",
         width:800,
         visible: false,
         disableSubmit: false
diff --git a/jero-web/src/views/documentManage/tags/index.vue b/jero-web/src/views/documentManage/tags/index.vue
index bbaf09aef..a7bf77e29 100644
--- a/jero-web/src/views/documentManage/tags/index.vue
+++ b/jero-web/src/views/documentManage/tags/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="tags">
     <a-card :bordered="false">
-    <div class="tag-tab">
-      <a-tabs type="card" @change="callback">
-        <a-tab-pane key="1" tab="标签项管理">
-          <tag-item></tag-item>
-        </a-tab-pane>
-        <a-tab-pane key="2" tab="标签内容管理">
-          <tag-content></tag-content>
-        </a-tab-pane>
-      </a-tabs>
-    </div>
+      <div class="tag-tab">
+        <a-tabs type="card" @change="callback">
+          <a-tab-pane key="1" :tab="$t('TagItemManagement')">
+            <tag-item></tag-item>
+          </a-tab-pane>
+          <a-tab-pane key="2" :tab="$t('LabelContentManagement')">
+            <tag-content></tag-content>
+          </a-tab-pane>
+        </a-tabs>
+      </div>
     </a-card>
   </div>
 </template>
diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index a63b96282..c13b519e9 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -2,7 +2,6 @@
   <div class="tab-table">
     <a-table
       ref="table"
-      bordered
       size="middle"
       rowKey="id"
       :columns="columns"
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 1ca4a9136..559bae392 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -23,7 +23,7 @@
           {{$t('add')}}
         </div>
       </div>
-      <a-modal class="show-content" v-model="contentVisible" :visible="contentVisible" title="新增" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel" v-if="contentVisible">
+      <a-modal class="show-content" v-model="contentVisible" :visible="contentVisible" :title="$t('add')" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="contentVisible">
         <a-form-model
           class="tag-content"
           ref="ruleForm"
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index 93c57d5f3..296a7db67 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -30,8 +30,8 @@
         <a-popover placement="right" v-model="typeVisible" trigger="click">
           <template slot="content"  class="type-popover-content">
             <div class="type-popover">
-              <p class="type type-input" @click="handleAddPop('input')">输入框类型</p>
-              <p class="type type-select" @click="handleAddPop('select')">下拉选类型</p>
+              <p class="type type-input" @click="handleAddPop('input')">{{$t('InputBoxType')}}</p>
+              <p class="type type-select" @click="handleAddPop('select')">{{$t('DropDownType')}}</p>
             </div>
           </template>
           <a-icon type="plus" />
@@ -40,22 +40,22 @@
       </div>
       <div class="operator-text" @click="handleShow">
         <a-icon type="rocket" :rotate="45" />
-        展示区域管理
+        {{$t('ExhibitionAreaManagement')}}
       </div>
     </div>
      <a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close" :visible="drawerVisible" :after-visible-change="afterVisibleChange" >
        <new-drawer v-if="drawerVisible&&editFlag" :drawerVisible="drawerVisible" :isTagContent="isTagContent" :editData="editData" :editId="editId" :submitEdit="submitEdit" @closeTag="closeTag" ></new-drawer>
      </a-drawer>
-     <a-modal class="show-area" v-model="areaVisible" title="展示区域管理" :footer="null" @cancel="hideModal">
+     <a-modal class="show-area" v-model="areaVisible" :title="$t('ExhibitionAreaManagement')" :footer="null" @cancel="hideModal">
        <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
      </a-modal>
      <div class="tag-doc-tab">
        <a-spin :spinning="spinning" tip="Loading...">
        <a-tabs default-active-key="1" @change="callbackTab">
-         <a-tab-pane key="1" tab="文档库">
+         <a-tab-pane key="1" :tab="$t('DocumentLibrary')">
            <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete"  @queryParams="queryParams" :total="total"></tabTable>
          </a-tab-pane>
-         <a-tab-pane key="2" tab="文档拆分" force-render>
+         <a-tab-pane key="2" :tab="$t('DocumentSplitting')" force-render>
            <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" :total="total"></tabTable>
          </a-tab-pane>
        </a-tabs>
@@ -85,7 +85,7 @@
           page:1,
           pageSize:10,
         },
-        titleTag:'新增标签项',
+        titleTag:this.$t('NewLabelItem'),
         typeVisible:false,
         isTagContent:false,
         editData:{},  //编辑的数据
@@ -349,7 +349,7 @@
       },
       handleAddPop(val){
         this.drawerVisible=true
-        this.titleTag='新增标签项'
+        this.titleTag=this.$t('NewLabelItem')
         this.submitEdit='add'
         if(val=='input'){
           this.typeVisible=false