From 00d879ba9e8861fe2a838d078ecb4fd7aaee9a22 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 24 Feb 2022 17:04:18 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/documentManage/library/index.vue    |   2 +-
 .../src/views/documentManage/ocr/index.vue    | 135 ++++++++++--------
 .../views/documentManage/splitting/index.vue  |  17 ++-
 .../documentManage/tags/tabs/tagContent.vue   |   8 +-
 .../documentManage/tags/tabs/tagItem.vue      |  32 +++--
 5 files changed, 117 insertions(+), 77 deletions(-)

diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index decd28604..6713d4ed0 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -250,5 +250,5 @@
 </script>
 
 <style scoped>
-  @import '~@assets/less/common.less'
+  @import '~@assets/less/common.less';
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 2b78ed024..69c453a85 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -33,11 +33,20 @@
         </a-form>
       </div>
     </div>
-    <div class="table-operator">
-      <a-button @click="handleUpload()" type="primary">上传</a-button>
-      <a-button @click="handleFileExport()" type="primary">调取已入库文件</a-button>
-      <a-button @click="handleDel()" type="primary">批量删除</a-button>
-    </div>
+      <div class="table-operator">
+        <div class="operator-text" @click="handleUpload">
+          <a-icon type="plus" />
+          上传
+        </div>
+        <div class="operator-text" @click="handleFileExport">
+          <a-icon type="export" />
+          调取已入库文件
+        </div>
+        <div class="operator-text" @click="handleDel">
+          <a-icon type="delete" />
+          批量删除
+        </div>
+      </div>
     <!--        上传弹框-->
     <a-modal
       class="show-content"
@@ -110,32 +119,44 @@
       <p style="text-align: center">确定对该文件未进行校验?</p>
     </a-modal>
     <div class="table-detail">
-      <a-table bordered :data-source="dataSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
-        <a slot="fileName" slot-scope="text, record" @click="fileDetail(record)">{{ text }}</a>
-        <template slot="action" slot-scope="text, record">
-          <a class="action action-syn" href="javascript:;" @click="actionSynchron(record)">同步至文档库</a>
-          <a class="action action-check" href="javascript:;" @click="actionCheck(record)">校核</a>
-          <a class="action action-down" href="javascript:;" @click="actionDown(record)">下载</a>
-          <a-popconfirm
-            v-if="dataSource.length"
-            title="Sure to delete?"
-            @confirm="() => actionDelete(record)"
-          >
-            <a class="action action-delete" href="javascript:;">删除</a>
-          </a-popconfirm>
-        </template>
-      </a-table>
-      <div class="page" v-if="dataSource.length > 0">
-        <a-pagination
-          :show-total="total => `共 ${total} 条`"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="queryParams.pageSize"
-          :total="total"
-          @change="onChangePage"
-          @showSizeChange="SizeChange"
-        />
-      </div>
+      <tableData
+        :flag="'2'"
+        :OperationList="OperationList"
+        @actionSynchron="actionSynchron"
+        :url="url"
+        showAction
+        @actionCheck="actionCheck"
+        @actionDown="actionDown"
+        @onSelectChange="onSelectChange"
+        @actionDelete="actionDelete"
+      />
+
+<!--      <a-table bordered :data-source="dataSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >-->
+<!--        <a slot="fileName" slot-scope="text, record" @click="fileDetail(record)">{{ text }}</a>-->
+<!--        <template slot="action" slot-scope="text, record">-->
+<!--          <a class="action action-syn" href="javascript:;" @click="actionSynchron(record)">同步至文档库</a>-->
+<!--          <a class="action action-check" href="javascript:;" @click="actionCheck(record)">校核</a>-->
+<!--          <a class="action action-down" href="javascript:;" @click="actionDown(record)">下载</a>-->
+<!--          <a-popconfirm-->
+<!--            v-if="dataSource.length"-->
+<!--            title="Sure to delete?"-->
+<!--            @confirm="() => actionDelete(record)"-->
+<!--          >-->
+<!--            <a class="action action-delete" href="javascript:;">删除</a>-->
+<!--          </a-popconfirm>-->
+<!--        </template>-->
+<!--      </a-table>-->
+<!--      <div class="page" v-if="dataSource.length > 0">-->
+<!--        <a-pagination-->
+<!--          :show-total="total => `共 ${total} 条`"-->
+<!--          show-quick-jumper-->
+<!--          show-size-changer-->
+<!--          :page-size.sync="queryParams.pageSize"-->
+<!--          :total="total"-->
+<!--          @change="onChangePage"-->
+<!--          @showSizeChange="SizeChange"-->
+<!--        />-->
+<!--      </div>-->
     </div>
     <addForm
       ref="addFormRef"
@@ -178,6 +199,24 @@
     },
     data(){
       return{
+        OperationList: [
+          {
+            text: '同步至文档库',
+            ClickEvent: 'actionSynchron'
+          },
+          {
+            text: '校核',
+            ClickEvent: 'actionCheck'
+          },
+          {
+            text: '下载',
+            ClickEvent: 'actionDown'
+          },
+          {
+            text: '删除',
+            ClickEvent: 'actionDelete'
+          }
+        ],
         pageSize:10,
         labelCol: { span:4 },
         wrapperCol: { span: 18 },
@@ -202,8 +241,9 @@
           ]
         },
         url: {
+          tableHeader: 'ocr/ocrRecord/getHeader',      //表格头部字段
           seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
-          tableList: 'document/bussDocumentLibraryEO/queryPageInfo',         //表格数据
+          tableList: 'ocr/ocrRecord/page',         //表格数据
           // getAddForm: 'document/bussDocumentLibraryEO/getAddForm',   // 表单的字段
           // addInfo: 'document/bussDocumentLibraryEO/addInfo',      //新增
           // updateInfo: 'document/bussDocumentLibraryEO/updateInfo',   //编辑
@@ -383,10 +423,7 @@
             onCancel() {},
           });
         }else{
-          this.$notification['warning']({
-            message: '请选择至少一条数据！',
-            description:'',
-          });
+          this.$message.warning('请选择至少一条数据！');
         }
       },
       //同步
@@ -431,29 +468,11 @@
       handleOk(){
         this.$refs.fileForm.validate((valid)=>{
           let params={ ...this.form }
-          // let formData = new FormData();
-          // console.log('formData',formData)
-          // formData.append('attId',this.form.attId);
-          // console.log('this.form.attId',this.form.attId)
-          // console.log('formData111',formData)
-          // formData.append('standName',this.form.standName);
-          // formData.append('standNumber',this.form.standNumber);
-          // formData.append('fileType',this.form.fileType);
-          let headers = {
-            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-          }
-          // console.log('params',formData)
-
           if(valid) {
-            // axios.post(`ocr/OcrRestful/addOcrRecord`,params, { headers: headers })
-            //   .then(res => {
-            //     if (res.success) {
-            //       this.loadData()
-            //     }
-            //   })
-
-            postAction(`ocr/OcrRestful/addOcrRecord`,params).then(res=>{
+            postAction(`ocr/ocrRecord/add`,params).then(res=>{
               if(res.success){
+                this.$message.success(res.result)
+                this.$emit('ok')
                 this.loadData()
               }
             })
@@ -472,6 +491,7 @@
         })
         // /** 赋值给当前对应的表单文件 */
         this.form.attId = attIdList.join(',')
+        console.log('form1111',this.form)
       },
       fileUpload(){
         this.$refs.uploadFile.visible=true
@@ -519,6 +539,7 @@
 </script>
 
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
   .ocr{
     .table-detail{
       .action{
diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue
index ac4a8236e..ac1c3a969 100644
--- a/jero-web/src/views/documentManage/splitting/index.vue
+++ b/jero-web/src/views/documentManage/splitting/index.vue
@@ -5,9 +5,18 @@
             <search :flag="'1'" :url="url"/>
           </div>
         <div class="table-operator">
-          <a-button @click="handleModule()" type="primary">拆分已入库文本</a-button>
-          <a-button @click="handleExport()" type="primary">导入拆分结果</a-button>
-          <a-button @click="handleDel()" type="danger">批量删除</a-button>
+          <div class="operator-text" @click="handleModule">
+            <a-icon type="plus" />
+            拆分已入库文本
+          </div>
+          <div class="operator-text" @click="handleExport">
+            <a-icon type="export" />
+            导入拆分结果
+          </div>
+          <div class="operator-text" @click="handleDel">
+            <a-icon type="delete" />
+            批量删除
+          </div>
         </div>
         <div class="splitting-table">
           <tableData
@@ -132,7 +141,7 @@
 </script>
 
 <style lang="less" scoped>
-
+  @import '~@assets/less/common.less';
 </style>
 
 <style lang="less">
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 6a5ad0fcb..b8dd7f3c4 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -17,8 +17,11 @@
           </a-row>
         </a-form>
       </div>
-      <div class="table-operator" style="border-top: 5px">
-        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <div class="table-operator">
+        <div class="operator-text" @click="handleAdd">
+          <a-icon type="plus" />
+          {{$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-form-model
@@ -328,6 +331,7 @@
 </script>
 
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
   .tag-content{
     .tag-con-table{
       .action-dict,.action-edit{
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index fdf201564..4aa7f9d1a 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -25,19 +25,24 @@
          </a-row>
        </a-form>
      </div>
-     <div class="table-operator" style="border-top: 5px">
-       <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>
-           </div>
-         </template>
-         <a-button type="primary">{{$t('add')}}</a-button>
-       </a-popover>
-
-       <a-button type="primary" @click="handleShow">展示区域管理</a-button>
-     </div>
+    <div class="table-operator">
+      <div class="operator-text">
+        <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>
+            </div>
+          </template>
+          <a-icon type="plus" />
+          {{$t('add')}}
+        </a-popover>
+      </div>
+      <div class="operator-text" @click="handleShow">
+        <a-icon type="rocket" :rotate="45" />
+        展示区域管理
+      </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>
@@ -378,6 +383,7 @@
 </script>
 
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
 .type-popover{
   p{
     margin:5px;