From 068df9c32a961e746ed740cf1064786f29ed08ac Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 2 Mar 2022 16:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentManage/tags/dialog/areaManage.vue | 51 +++++++++++++++----
 .../documentManage/tags/dialog/listTable.vue  |  2 +-
 .../documentManage/tags/dialog/treeTable.vue  |  1 -
 .../documentManage/tags/tabs/tagItem.vue      | 12 ++++-
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index ab26a1d55..a95922239 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="diolag-area">
-    <a-button type="primary" @click="showModal">新增</a-button>
-    <a-modal class="area-module" v-model="newVisible" title="新增" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
+    <div class="table-operator">
+      <div class="operator-text" @click="showModal">
+          <a-icon type="plus"  />
+          {{$t('add')}}
+      </div>
+    </div>
+<!--    <a-button type="primary" @click="showModal">新增</a-button>-->
+    <a-modal class="area-module" v-model="newVisible" :title="$t('add')" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
       <a-form-model
         class="tag-module"
         ref="ruleForm"
@@ -53,12 +59,11 @@
     <a-table
       class="table-area"
       ref="table"
-      bordered
       size="middle"
       rowKey="id"
       :columns="columns"
       :dataSource="areaTable"
-      :pagination="ipagination"
+      :pagination="false"
       :loading="loading"
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange">
@@ -74,8 +79,20 @@
          >
           <a style="color:red" href="javascript:;">删除</a>
         </a-popconfirm>
-        </span>
+      </span>
     </a-table>
+    <div class="page" v-if="areaTable.length > 0">
+      <a-pagination
+        :show-total="total => `共 ${total} 条`"
+        show-quick-jumper
+        show-size-changer
+        :current="queryParams.pageNo"
+        :page-size.sync="queryParams.pageSize"
+        :total="total"
+        @change="onChangePage"
+        @showSizeChange="SizeChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -88,6 +105,11 @@
     },
     data(){
       return{
+        queryParams:{
+          pageNo:1,
+          pageSize:10
+        },
+        total:0,
         selectedRowKeys: [],
         loading: false,
         ipagination:true,
@@ -179,9 +201,7 @@
             if(this.form.id){
               putAction(`tag/onlCgformArea/edit`,this.form).then((res)=>{
                 if(res.success){
-                  this.$notification.success({
-                    message: res.result,
-                  });
+                  this.$message.success(res.result);
                   this.$emit('updateOk',res.result)
                   this.form={
                     isModel:'',
@@ -195,9 +215,7 @@
               //新增
               postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{
                   if(res.success){
-                    this.$notification.success({
-                      message: res.result,
-                    });
+                    this.$message.success( res.result,);
                     this.$emit('submitOk',res.result)
                     this.form={
                       isModel:'',
@@ -248,6 +266,16 @@
           }
         })
       },
+      //点击页数
+      onChangePage(page,pageSize){
+        this.queryParams.pageNo = page
+        this.$emit('Ok')
+      },
+      //一页显示条数
+      SizeChange(page,pageSize){
+        this.queryParams.pageSize = pageSize
+        this.$emit('Ok')
+      },
       //正则替换小数点
       limitNumber(value) {
         if (typeof value === 'string') {
@@ -263,6 +291,7 @@
 </script>
 
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
   .diolag-area{
     .table-area{
       margin: 20px 0;
diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
index 20dcb52f0..6ef68269e 100644
--- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="list-table">
-      <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
+      <a-table :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
 
         <template slot="action" slot-scope="text, record">
           <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
index 4d141a0f7..c1ff66d3a 100644
--- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
@@ -2,7 +2,6 @@
     <div class="tree-table">
       <div class="tree-table-content">
         <a-table
-          bordered
           class="tree-table-con"
           :columns="columns"
           :data-source="tabData"
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index 296a7db67..faca05204 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -47,7 +47,7 @@
        <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="$t('ExhibitionAreaManagement')" :footer="null" @cancel="hideModal">
-       <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
+       <area-manage v-if="areaVisible" @diaHide="diaHide" :total="areaTotal" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
      </a-modal>
      <div class="tag-doc-tab">
        <a-spin :spinning="spinning" tip="Loading...">
@@ -203,6 +203,7 @@
         ],
         areaVisible:false,
         areaTable:[],
+        areaTotal:0,
         drawerVisible:false,
         value:1,
         editId:'',
@@ -240,6 +241,7 @@
         getAction(`/tag/onlCgformArea/list`,{}).then(res=>{
           if(res.success){
             this.areaTable=res.result
+            this.areaTotal=res.total
           }
         })
       },
@@ -403,6 +405,14 @@
         width: 800px!important;
       }
     }
+    .diolag-area{
+      .table-operator{
+        text-align: right;
+      }
+      .page{
+        text-align: right;
+      }
+    }
   }
 
 </style>
\ No newline at end of file