From 54dbf553a770104d18fedbd6164e70b94620668c Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 11 Jun 2022 13:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A0=87=E7=AD=BE=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=A0=91=E7=8A=B6=E7=BB=93=E6=9E=84=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/permission.js                                | 1 +
 jero-web/src/views/documentManage/tags/dialog/DicList.vue | 2 +-
 .../src/views/documentManage/tags/dialog/TreeTable.vue    | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js
index 24e2e97e5..4ac026048 100644
--- a/jero-web/src/permission.js
+++ b/jero-web/src/permission.js
@@ -114,6 +114,7 @@ router.beforeEach((to, from, next) => {
       next()
     } else {
       next({ path: '/user/login', query: { redirect: to.fullPath } })
+
       let fullPath = ''
       if (to.fullPath == '/') {
         fullPath = INDEX_MAIN_PAGE_PATH
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index 547281a49..281bc9c3b 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -26,7 +26,7 @@
         </div>
         <div class="dic-list-table">
           <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"  @ok="ok"></list-table>
-          <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" :queryParams="queryParams" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok" :total="total"></tree-table>
+          <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" :queryParams="queryParams" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok" :total="total" :isPagination="false"></tree-table>
         </div>
         <a-modal class="dict-module" v-model="newVisible" :title="title" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
           <a-form-model
diff --git a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue
index a3844b756..5ef61d6ef 100644
--- a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue
@@ -17,7 +17,7 @@
             <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'sys:category:logicDelete'">{{$t('delete')}}</a>
           </template>
         </a-table>
-        <div class="page" v-if="tabData.length > 0">
+        <div class="page" v-if="tabData.length > 0 && isPagination">
           <a-pagination
             :show-total="total => $t('total')+` ${total} `+$t('strip')"
             show-quick-jumper
@@ -41,7 +41,11 @@
       tabletreeData:Array,
       record:Object,
       total:Number,
-      queryParams:Object
+      queryParams:Object,
+      isPagination: {
+        type: Boolean,
+        default: true
+      }
     },
     data(){
       return{