From 40a35fedf395f6214b5b958e0a4127bc15529f75 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Tue, 8 Mar 2022 15:37:47 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=96=87=E6=A1=A3=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/zh-cn.js                        | 2 +-
 jero-web/src/components/ocrAddForm/index.vue             | 8 ++++----
 jero-web/src/views/documentManage/ocr/index.vue          | 7 ++++++-
 jero-web/src/views/documentManage/tags/tabs/tabTable.vue | 6 +++++-
 jero-web/src/views/documentManage/tags/tabs/tagItem.vue  | 2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 6e19388c9..dd5fa870a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -424,7 +424,7 @@ module.exports = {
   LabeItemName:'标签项名称',
   PleaseEnterLabelName:'请输入标签名称',
   DisplayArea:'展示区域',
-  ChineseName:'中文名称',
+  ChineseName:'属性名称',
   AttributeType:'属性类型',
   FieldLength:'字段长度',
   DisplayOrder:'展示顺序',
diff --git a/jero-web/src/components/ocrAddForm/index.vue b/jero-web/src/components/ocrAddForm/index.vue
index abf2d9c62..daed13cb8 100644
--- a/jero-web/src/components/ocrAddForm/index.vue
+++ b/jero-web/src/components/ocrAddForm/index.vue
@@ -271,7 +271,7 @@
     },
     methods: {
       sumber() {
-        console.log('vilidate',this.$refs.ruleForm1)
+        console.log('vilidate',this.formInline)
         this.$refs.ruleForm1.validate(valid => {
           console.log('va',valid)
           if (valid) {
@@ -283,11 +283,11 @@
             }
             postAction(url, this.formInline).then((res) => {
               if (res.success) {
-                this.$message.success(res.message)
+                this.$message.success(this.$t('OperationSuccessful'))
                 eventBUs.$emit('searchReset')
                 this.$emit('addFormClick')
               } else {
-                this.$message.warning(res.message)
+                this.$message.warning(this.$t('operationFailed'))
               }
             })
           } else {
@@ -310,6 +310,7 @@
           /** 赋值给当前对应的表单文件 */
           this.formInline[this.uploadName] = attIdList.join(',')
           this.formInline = { ...this.formInline }
+          console.log('form',this.formInline)
         }
       },
       handleInput(value) {
@@ -371,7 +372,6 @@
         this.$set(this, 'rules', rules)
         this.isFormInline = true
         this.confirmLoading = false
-        console.log('rules',rules,this)
       },
       getForm() {
         this.confirmLoading = true
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 0d613c7bf..b620dcd95 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -192,6 +192,9 @@
     methods:{
       //上传
       handleUpload(){
+        // if(this.timer){
+        //   clearInterval(this.timer)
+        // }
         this.fileVisible=true
       },
       //调取已入库文件
@@ -245,8 +248,9 @@
       //下载
       actionDown(val){
         // downloadFile('/sys/common/download', val.docRealName, { id: val.attId })
+        downloadFile('ocr/OcrRestful/downFile', val.docRealName, { fileName: val.docRealName })
         // downloadFile(val.docRealFile)
-        window.open(val.docRealFile)
+        // window.open(val.docRealFile)
       },
       //删除
       actionDelete(record){
@@ -280,6 +284,7 @@
       },
       //上传确定按钮
       modalOk(){
+
         this.$refs.fileForm.sumber()
       },
       handleCancel(){
diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index b4ce2da6c..db5ffc38e 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -50,10 +50,14 @@
     props:{
       tableData:Array,
       columns:Array,
-      total:Number
+      total:Number,
+      parm:Object
     },
     mounted() {
+      this.queryParams.pageNo=this.parm.pageNo
+      this.queryParams.pageSize=this.parm.pageSize
       // console.log('colum',this.tableData,this.columns)
+      console.log('query',this.queryParams)
     },
     methods:{
       onSelectChange(selectedRowKeys) {
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index f509e5dbb..11809a02f 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -44,7 +44,7 @@
        <a-spin :spinning="spinning" tip="Loading...">
        <a-tabs default-active-key="1" @change="callbackTab">
          <a-tab-pane key="1" :tab="$t('DocumentLibrary')">
-           <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete"  @queryParams="queryParams" :total="total"></tabTable>
+           <tabTable v-if="spinning==false" :tableData="tableData" :columns="taglabColumns" :parm="queryParam" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" :total="total"></tabTable>
          </a-tab-pane>
 <!--         <a-tab-pane key="2" :tab="$t('DocumentSplitting')" force-render>-->
 <!--           <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" :total="total"></tabTable>-->