From 435e4565f45b5a62084f9483329b90d9807fa8ab Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Mon, 7 Mar 2022 18:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/documentManage/ocr/index.vue    | 31 +++++++++++++++++--
 .../tags/dialog/OnlCgformTagForm.vue          |  1 +
 .../documentManage/tags/tabs/tabTable.vue     |  6 ++--
 .../documentManage/tags/tabs/tagItem.vue      | 17 +++++-----
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 22a33ce1a..0d613c7bf 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -164,7 +164,9 @@
         confirmLoading: false,
         selectedIds:'',   //选择行id
         record:{},
-        accept:'application/pdf'
+        accept:'application/pdf',
+        today:'',
+        timer:''
       }
     },
     props:{
@@ -173,6 +175,20 @@
     mounted() {
       // this.loadData()
     },
+    created() {
+      const date = new Date(),
+      year = date.getFullYear(),
+      month = date.getMonth()+1,
+      myDate = date.getDate()
+      this.today = `${year}/${month < 10 ? '0'+month : month}/${myDate < 10 ? '0'+myDate : myDate}`
+      if(this.timer){
+         clearInterval(this.timer)
+      }else{
+         eventBUs.$emit('searchReset')
+         this.initSetTimeout(this.today)//调用每隔10秒刷新数据
+      }
+    },
+
     methods:{
       //上传
       handleUpload(){
@@ -325,8 +341,17 @@
       },
       addFormClick() {
         this.fileVisible = false
-      }
-    }
+      },
+      //10秒刷新页面
+      initSetTimeout(today) {//每隔10秒刷新数据，也就是每隔10秒向后台请求一次数据
+        this.timer=setInterval( () => {
+          eventBUs.$emit('searchReset')
+        }, 10000)
+      },
+    },
+    beforeDestroy(){
+      clearInterval(this.timer)
+    },
   }
 </script>
 
diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
index e0fd425aa..92d8caa80 100644
--- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
@@ -351,6 +351,7 @@
               httpurl+=this.url.add;
               method = 'post';
               this.form.id=''
+              this.form.isReadOnly=0
             }else if(this.submitEdit=='edit'){
               httpurl+=this.url.edit;
               method = 'put';
diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index e5c79ec4a..b4ce2da6c 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -11,9 +11,9 @@
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange">
       <span slot="action" slot-scope="text, record">
-          <a @click="editVisible(record.id)" v-if="!record.is_read_only">{{$t('edit')}}</a>
-          <a-divider type="vertical" v-if="!record.is_read_only" />
-          <a class="table-del" @click="deleteVisible(record.id)">{{$t('delete')}}</a>
+          <a @click="editVisible(record.id)" v-if="record.isReadOnly==0">{{$t('edit')}}</a>
+          <a-divider type="vertical" v-if="record.isReadOnly==0" />
+          <a class="table-del" v-if="record.isReadOnly==2||record.isReadOnly==0" @click="deleteVisible(record.id)">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div class="page" v-if="tableData.length > 0">
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index b763edd95..b1c88bf65 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -88,37 +88,37 @@
             title: this.$t('ChineseName'),
             align: "center",
             width: 100,
-            dataIndex: 'db_field_txt',
+            dataIndex: 'dbFieldTxt_dictText',
           },
           {
             title: this.$t('enName'),
             align: "center",
             width: 100,
-            dataIndex: 'db_field_en_name',
+            dataIndex: 'dbFieldEnName_dictText',
           },
           {
             title: this.$t('AttributeType'),
             align: "center",
             width: 100,
-            dataIndex: 'item_text',
+            dataIndex: 'fieldShowType_dictText',
           },
           {
             title: this.$t('FieldLength'),
             align: "center",
             width: 80,
-            dataIndex: 'db_length'
+            dataIndex: 'dbLength_dictText'
           },
           {
             title: this.$t('DisplayOrder'),
             align: "center",
             width: 80,
-            dataIndex: 'order_num'
+            dataIndex: 'orderNum_dictText'
           },
           {
             title: this.$t('DisplayArea'),
             align: "center",
             width: 80,
-            dataIndex: 'show_area'
+            dataIndex: 'showAreaName_dictText'
           },
           {
             title: this.$t('operation'),
@@ -212,7 +212,10 @@
         postAction(`tag/onlCgformTag/page`,params).then(res=>{
           if(res.success){
             this.total=res.result.total
-            this.tableData= [ ...res.result]
+            this.tableData= [ ...res.result.records]
+            this.spinning=false
+          }else{
+            this.$message.warning(res.message)
             this.spinning=false
           }
         })