From 6e69b77c13dfbb7f11c699a8c4e77a479b347d6f Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 3 Aug 2023 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E9=97=B4=E8=B7=9D=20=E6=8C=89=E9=92=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=20=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/assets/less/common.less          | 12 ++++++--
 .../components/jero/modal/JPopupOnlReport.vue |  6 ++--
 jero-web/src/components/page/GlobalLayout.vue |  6 ++--
 jero-web/src/views/demo/JeroDemoList.vue      |  6 ++--
 jero-web/src/views/demo/JeroOrderMainList.vue | 10 +++----
 .../JeroOrderMainListForJEditableTable.vue    | 20 ++++++-------
 jero-web/src/views/demo/RowspanTable.vue      |  2 +-
 jero-web/src/views/demo/SelectDemo.vue        |  2 +-
 jero-web/src/views/demo/TableExpandeSub.vue   | 10 +++----
 .../demo/tablist/JeroOrderCustomerList.vue    |  8 ++---
 .../views/demo/tablist/JeroOrderDMainList.vue | 10 +++----
 .../demo/tablist/JeroOrderTicketList.vue      |  8 ++---
 .../views/modules/message/SysMessageList.vue  | 12 ++++----
 .../message/SysMessageTemplateList.vue        | 20 ++++++-------
 .../src/views/modules/oss/OSSFileList.vue     | 12 ++++----
 jero-web/src/views/system/DataLogList.vue     | 10 +++----
 jero-web/src/views/system/DepartList.vue      | 14 ++++-----
 jero-web/src/views/system/DepartListSync.vue  |  2 +-
 .../src/views/system/NewPermissionList.vue    | 10 +++----
 jero-web/src/views/system/PermissionList.vue  | 12 ++++----
 jero-web/src/views/system/QuartzJobList.vue   |  8 ++---
 jero-web/src/views/system/RoleUserList.vue    | 24 +++++++--------
 .../src/views/system/SysAnnouncementList.vue  |  8 ++---
 jero-web/src/views/system/SysCategoryList.vue |  8 ++---
 .../src/views/system/SysCheckRuleList.vue     | 22 +++++++-------
 .../src/views/system/SysDataSourceList.vue    | 16 +++++-----
 jero-web/src/views/system/SysFillRuleList.vue | 22 +++++++-------
 .../src/views/system/SysUserOnlineList.vue    |  8 ++---
 jero-web/src/views/system/TenantList.vue      |  8 ++---
 .../src/views/system/UserAnnouncementList.vue |  2 +-
 jero-web/src/views/system/UserList.vue        |  8 ++---
 .../src/views/system/modules/DeptUserInfo.vue | 10 +++----
 .../system/modules/SelectUserListModal.vue    |  2 +-
 .../views/system/modules/SelectUserModal.vue  |  2 +-
 .../system/modules/UserRecycleBinModal.vue    | 30 +++++++++----------
 35 files changed, 188 insertions(+), 182 deletions(-)

diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index 194a03a4..695a9627 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -1,7 +1,7 @@
 
 /*列表上方操作按钮区域*/
 .ant-card-body .table-operator {
-  margin-bottom: 8px;
+  //margin-bottom: 8px;
 }
 /** Button按钮间距 */
 .table-operator .ant-btn {
@@ -12,7 +12,7 @@
 }
 
 .table-operator .ant-btn-group .ant-btn:last-child {
-  margin: 0 8px 8px 0;
+  margin: 0 8px 0px 0;
 }
 /*列表td的padding设置 可以控制列表大小*/
 .ant-table-tbody .ant-table-row td {
@@ -66,5 +66,11 @@
 
 }
 .table-page-search-wrapper .ant-form-inline .ant-form-item{
-  margin-bottom: 12px;
+  margin-bottom: 4px;
 }
+.ant-card-body .table-operator{
+  margin-bottom: 4px !important;
+}
+.ant-tabs-bar {
+  margin-bottom: 0px;
+}
\ No newline at end of file
diff --git a/jero-web/src/components/jero/modal/JPopupOnlReport.vue b/jero-web/src/components/jero/modal/JPopupOnlReport.vue
index ca66dae7..b7ea184d 100644
--- a/jero-web/src/components/jero/modal/JPopupOnlReport.vue
+++ b/jero-web/src/components/jero/modal/JPopupOnlReport.vue
@@ -43,9 +43,9 @@
     </div>
 
     <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-      <i class="anticon anticon-info-circle ant-alert-icon"></i>
-      已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-      <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+<!--      <i class="anticon anticon-info-circle ant-alert-icon"></i>-->
+<!--      已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--      <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
 
       <a v-if="!showSearchFlag" style="margin-left: 24px" @click="onlyReload">刷新</a>
     </div>
diff --git a/jero-web/src/components/page/GlobalLayout.vue b/jero-web/src/components/page/GlobalLayout.vue
index f83661b4..e8673f37 100644
--- a/jero-web/src/components/page/GlobalLayout.vue
+++ b/jero-web/src/components/page/GlobalLayout.vue
@@ -198,7 +198,7 @@ export default {
     }
   }
   .ant-card-body {
-      padding: 24px 24px 0 !important;
+      padding: 16px 16px 0 !important;
   }
   .layout {
     min-height: 100vh !important;
@@ -688,7 +688,7 @@ export default {
 
       .ant-form-item {
         display: flex;
-        margin-bottom: 24px;
+        margin-bottom: 12px;
         margin-right: 0;
 
         .ant-form-item-control-wrapper {
@@ -711,7 +711,7 @@ export default {
 
     .table-page-search-submitButtons {
       display: block;
-      margin-bottom: 24px;
+      margin-bottom: 12px;
       white-space: nowrap;
     }
 
diff --git a/jero-web/src/views/demo/JeroDemoList.vue b/jero-web/src/views/demo/JeroDemoList.vue
index 23c03b83..2643ca6e 100644
--- a/jero-web/src/views/demo/JeroDemoList.vue
+++ b/jero-web/src/views/demo/JeroDemoList.vue
@@ -79,9 +79,9 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-          selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--          selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
         <span style="float:right;">
           <a @click="loadData()"><a-icon type="sync" />刷新</a>
           <a-divider type="vertical" />
diff --git a/jero-web/src/views/demo/JeroOrderMainList.vue b/jero-web/src/views/demo/JeroOrderMainList.vue
index 3dfe6c05..0ba5b8bf 100644
--- a/jero-web/src/views/demo/JeroOrderMainList.vue
+++ b/jero-web/src/views/demo/JeroOrderMainList.vue
@@ -49,10 +49,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -177,7 +177,7 @@ export default {
     margin-left: 3px
   }
   .ant-card-body .table-operator{
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
   .ant-table-tbody .ant-table-row td{
     padding-top:15px;
diff --git a/jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue b/jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue
index c01b14f1..7eeea8ea 100644
--- a/jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue
+++ b/jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue
@@ -50,15 +50,15 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        <span>已选择</span>
-        <a style="font-weight: 600">
-          {{ selectedRowKeys.length }}
-        </a>
-        <span>项</span>
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>-->
+<!--        <span>已选择</span>-->
+<!--        <a style="font-weight: 600">-->
+<!--          {{ selectedRowKeys.length }}-->
+<!--        </a>-->
+<!--        <span>项</span>-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -184,7 +184,7 @@ export default {
 <style scoped>
 
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/demo/RowspanTable.vue b/jero-web/src/views/demo/RowspanTable.vue
index 167c30c6..9f10c50f 100644
--- a/jero-web/src/views/demo/RowspanTable.vue
+++ b/jero-web/src/views/demo/RowspanTable.vue
@@ -267,7 +267,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator{
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
   .ant-table-tbody .ant-table-row td{
     padding-top:15px;
diff --git a/jero-web/src/views/demo/SelectDemo.vue b/jero-web/src/views/demo/SelectDemo.vue
index 0834a567..56367aaf 100644
--- a/jero-web/src/views/demo/SelectDemo.vue
+++ b/jero-web/src/views/demo/SelectDemo.vue
@@ -646,7 +646,7 @@ export default {
 </script>
 <style lang="less" scoped>
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/demo/TableExpandeSub.vue b/jero-web/src/views/demo/TableExpandeSub.vue
index 5f79aff5..0c3ce6f4 100644
--- a/jero-web/src/views/demo/TableExpandeSub.vue
+++ b/jero-web/src/views/demo/TableExpandeSub.vue
@@ -50,10 +50,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -233,7 +233,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/demo/tablist/JeroOrderCustomerList.vue b/jero-web/src/views/demo/tablist/JeroOrderCustomerList.vue
index c08e8450..884ee2c8 100644
--- a/jero-web/src/views/demo/tablist/JeroOrderCustomerList.vue
+++ b/jero-web/src/views/demo/tablist/JeroOrderCustomerList.vue
@@ -20,10 +20,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/demo/tablist/JeroOrderDMainList.vue b/jero-web/src/views/demo/tablist/JeroOrderDMainList.vue
index 11cd6133..0a3e0be7 100644
--- a/jero-web/src/views/demo/tablist/JeroOrderDMainList.vue
+++ b/jero-web/src/views/demo/tablist/JeroOrderDMainList.vue
@@ -50,10 +50,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -247,7 +247,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/demo/tablist/JeroOrderTicketList.vue b/jero-web/src/views/demo/tablist/JeroOrderTicketList.vue
index f86bf36b..49fe5fa8 100644
--- a/jero-web/src/views/demo/tablist/JeroOrderTicketList.vue
+++ b/jero-web/src/views/demo/tablist/JeroOrderTicketList.vue
@@ -20,10 +20,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/modules/message/SysMessageList.vue b/jero-web/src/views/modules/message/SysMessageList.vue
index 438377e1..80a903ad 100644
--- a/jero-web/src/views/modules/message/SysMessageList.vue
+++ b/jero-web/src/views/modules/message/SysMessageList.vue
@@ -60,11 +60,11 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -206,7 +206,7 @@ export default {
   }
 
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/modules/message/SysMessageTemplateList.vue b/jero-web/src/views/modules/message/SysMessageTemplateList.vue
index 4395c3f7..5b83a89a 100644
--- a/jero-web/src/views/modules/message/SysMessageTemplateList.vue
+++ b/jero-web/src/views/modules/message/SysMessageTemplateList.vue
@@ -40,11 +40,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="default" icon="plus" v-has="'message:template:add'">新增</a-button>
-      <a-button type="default" icon="download" @click="handleExportXls('消息模板')" v-has="'message:template:export'">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" >新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="default" icon="import" v-has="'message:template:import'">导入</a-button>
+        <a-button type="default" icon="import" >导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
@@ -53,7 +53,7 @@
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px" v-has="'message:template:batchdel'"> 批量操作
+        <a-button style="margin-left: 8px"> 批量操作
           <a-icon type="down"/>
         </a-button>
       </a-dropdown>
@@ -61,11 +61,11 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -215,7 +215,7 @@ export default {
   }
 
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/modules/oss/OSSFileList.vue b/jero-web/src/views/modules/oss/OSSFileList.vue
index 8d190bff..b2e6637a 100644
--- a/jero-web/src/views/modules/oss/OSSFileList.vue
+++ b/jero-web/src/views/modules/oss/OSSFileList.vue
@@ -44,12 +44,12 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-          style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+<!--          style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
           ref="table"
diff --git a/jero-web/src/views/system/DataLogList.vue b/jero-web/src/views/system/DataLogList.vue
index 340ef7ca..2197d0fe 100644
--- a/jero-web/src/views/system/DataLogList.vue
+++ b/jero-web/src/views/system/DataLogList.vue
@@ -27,16 +27,16 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleCompare()" type="primary" icon="plus">数据比较</a-button>
+      <a-button @click="handleCompare()" type="default" icon="plus">数据比较</a-button>
     </div>
 
     <!--table区 -->
     <div>
       <!--已选择的清空 -->
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
       <a-table
         ref="table"
         size="middle"
diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index 932dcba5..2288fcbc 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -15,12 +15,12 @@
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-          <a-alert type="info" :showIcon="true">
-            <div slot="message">
-              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
-              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
-            </div>
-          </a-alert>
+<!--          <a-alert type="info" :showIcon="true">-->
+<!--            <div slot="message">-->
+<!--              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>-->
+<!--              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>-->
+<!--            </div>-->
+<!--          </a-alert>-->
           <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
           <!-- 树-->
           <a-col :md="10" :sm="24">
@@ -551,7 +551,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator {
-    margin: 15px;
+    margin-bottom: 4px;
   }
 
   .anty-form-btn {
diff --git a/jero-web/src/views/system/DepartListSync.vue b/jero-web/src/views/system/DepartListSync.vue
index 0832b1fd..50d9f8c8 100644
--- a/jero-web/src/views/system/DepartListSync.vue
+++ b/jero-web/src/views/system/DepartListSync.vue
@@ -616,7 +616,7 @@ export default {
 </style>
 <style scoped>
   .ant-card-body .table-operator {
-    margin: 15px;
+    margin-bottom: 4px;
   }
 
   .anty-form-btn {
diff --git a/jero-web/src/views/system/NewPermissionList.vue b/jero-web/src/views/system/NewPermissionList.vue
index 44b70b44..e3993fab 100644
--- a/jero-web/src/views/system/NewPermissionList.vue
+++ b/jero-web/src/views/system/NewPermissionList.vue
@@ -16,11 +16,11 @@
     <!-- table区域-begin -->
     <div>
 
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         :columns="columns"
diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue
index d9057f3c..026bd83f 100644
--- a/jero-web/src/views/system/PermissionList.vue
+++ b/jero-web/src/views/system/PermissionList.vue
@@ -7,7 +7,7 @@
       <a-button
         @click="batchDel"
         v-if="selectedRowKeys.length > 0"
-        
+
         type="default"
         icon="delete">批量删除
       </a-button>
@@ -16,11 +16,11 @@
     <!-- table区域-begin -->
     <div>
 
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         :columns="columns"
diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue
index 5d7b112e..30babc5e 100644
--- a/jero-web/src/views/system/QuartzJobList.vue
+++ b/jero-web/src/views/system/QuartzJobList.vue
@@ -49,10 +49,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index 22da9453..cb7c7cf0 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -31,7 +31,7 @@
           </a-form>
         </div>
         <!-- 操作按钮区域 -->
-        <div class="table-operator" style="margin: 5px 0 10px 2px">
+        <div class="table-operator" style="margin: 0 0 4px 2px">
           <a-button @click="handleAdd" type="default" icon="plus">新建角色</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
 <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@@ -40,13 +40,13 @@
 <!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
         </div>
 
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon">
-          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
-          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
-        </div>
+<!--        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--          <i class="anticon anticon-info-circle ant-alert-icon">-->
+<!--          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项-->
+<!--          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>-->
+<!--        </div>-->
 
-        <div style="margin-top: 15px">
+        <div >
           <a-table
             style="height:500px"
             ref="table"
@@ -134,11 +134,11 @@
         </div>
         <!-- table区域-begin -->
         <div>
-          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-            <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-            selectedRowKeys2.length }}</a>项
-            <a style="margin-left: 24px" @click="onClearSelected2">清空</a>
-          </div>
+<!--          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--            <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--            selectedRowKeys2.length }}</a>项-->
+<!--            <a style="margin-left: 24px" @click="onClearSelected2">清空</a>-->
+<!--          </div>-->
           <a-table
             style="height:500px"
             ref="table2"
diff --git a/jero-web/src/views/system/SysAnnouncementList.vue b/jero-web/src/views/system/SysAnnouncementList.vue
index 0eb066b4..b7af8cfa 100644
--- a/jero-web/src/views/system/SysAnnouncementList.vue
+++ b/jero-web/src/views/system/SysAnnouncementList.vue
@@ -40,10 +40,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/SysCategoryList.vue b/jero-web/src/views/system/SysCategoryList.vue
index f4e4142a..9387064c 100644
--- a/jero-web/src/views/system/SysCategoryList.vue
+++ b/jero-web/src/views/system/SysCategoryList.vue
@@ -18,10 +18,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/SysCheckRuleList.vue b/jero-web/src/views/system/SysCheckRuleList.vue
index aceff637..7496f6ba 100644
--- a/jero-web/src/views/system/SysCheckRuleList.vue
+++ b/jero-web/src/views/system/SysCheckRuleList.vue
@@ -54,17 +54,17 @@
     </div>
 
     <!-- table区域-begin -->
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="onClearSelected">清空</a>
-        </template>
-      </template>
-    </a-alert>
+<!--    <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
+<!--      <template slot="message">-->
+<!--        <span>已选择</span>-->
+<!--        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
+<!--        <span>项</span>-->
+<!--        <template v-if="selectedRowKeys.length>0">-->
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="onClearSelected">清空</a>-->
+<!--        </template>-->
+<!--      </template>-->
+<!--    </a-alert>-->
 
     <a-table
       ref="table"
diff --git a/jero-web/src/views/system/SysDataSourceList.vue b/jero-web/src/views/system/SysDataSourceList.vue
index 9574f1c6..91eb944d 100644
--- a/jero-web/src/views/system/SysDataSourceList.vue
+++ b/jero-web/src/views/system/SysDataSourceList.vue
@@ -52,14 +52,14 @@
     <!-- table区域-begin -->
     <div>
 
-      <a-alert type="info" showIcon style="margin-bottom: 16px;">
-        <template slot="message">
-          <span>已选择</span>
-          <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-          <span>项</span>
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </template>
-      </a-alert>
+<!--      <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
+<!--        <template slot="message">-->
+<!--          <span>已选择</span>-->
+<!--          <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
+<!--          <span>项</span>-->
+<!--          <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--        </template>-->
+<!--      </a-alert>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/SysFillRuleList.vue b/jero-web/src/views/system/SysFillRuleList.vue
index ed37850f..8b68405c 100644
--- a/jero-web/src/views/system/SysFillRuleList.vue
+++ b/jero-web/src/views/system/SysFillRuleList.vue
@@ -46,17 +46,17 @@
     </div>
 
     <!-- table区域-begin -->
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="onClearSelected">清空</a>
-        </template>
-      </template>
-    </a-alert>
+<!--    <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
+<!--      <template slot="message">-->
+<!--        <span>已选择</span>-->
+<!--        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
+<!--        <span>项</span>-->
+<!--        <template v-if="selectedRowKeys.length>0">-->
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="onClearSelected">清空</a>-->
+<!--        </template>-->
+<!--      </template>-->
+<!--    </a-alert>-->
 
     <a-table
       ref="table"
diff --git a/jero-web/src/views/system/SysUserOnlineList.vue b/jero-web/src/views/system/SysUserOnlineList.vue
index 46bdb09c..1bca878f 100644
--- a/jero-web/src/views/system/SysUserOnlineList.vue
+++ b/jero-web/src/views/system/SysUserOnlineList.vue
@@ -22,10 +22,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/TenantList.vue b/jero-web/src/views/system/TenantList.vue
index 7d0724bd..67f3c805 100644
--- a/jero-web/src/views/system/TenantList.vue
+++ b/jero-web/src/views/system/TenantList.vue
@@ -22,10 +22,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 8adf2d7f..2aa147fd 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -181,7 +181,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator{
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
   .anty-row-operator button{margin: 0 5px}
   .ant-btn-danger{background-color: #ffffff}
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index d4b2b0ab..1e2dfee9 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -121,10 +121,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index 5513bd49..f824d2c0 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -40,11 +40,11 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
diff --git a/jero-web/src/views/system/modules/SelectUserListModal.vue b/jero-web/src/views/system/modules/SelectUserListModal.vue
index 9b5dbaa0..054617f4 100644
--- a/jero-web/src/views/system/modules/SelectUserListModal.vue
+++ b/jero-web/src/views/system/modules/SelectUserListModal.vue
@@ -271,7 +271,7 @@ export default {
 </script>
 <style scoped>
   .ant-card-body .table-operator{
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td{
diff --git a/jero-web/src/views/system/modules/SelectUserModal.vue b/jero-web/src/views/system/modules/SelectUserModal.vue
index 8b372cb9..e5bd5f64 100644
--- a/jero-web/src/views/system/modules/SelectUserModal.vue
+++ b/jero-web/src/views/system/modules/SelectUserModal.vue
@@ -253,7 +253,7 @@ export default {
 </script>
 <style lang="less" scoped>
   .ant-card-body .table-operator {
-    margin-bottom: 18px;
+    margin-bottom: 4px;
   }
 
   .ant-table-tbody .ant-table-row td {
diff --git a/jero-web/src/views/system/modules/UserRecycleBinModal.vue b/jero-web/src/views/system/modules/UserRecycleBinModal.vue
index 9bf50f7f..3d4619b5 100644
--- a/jero-web/src/views/system/modules/UserRecycleBinModal.vue
+++ b/jero-web/src/views/system/modules/UserRecycleBinModal.vue
@@ -7,21 +7,21 @@
     cancelText="关闭"
     :okButtonProps="{style:{display:'none'}}"
   >
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="handleClearSelection">清空选择</a>
-          <a-divider type="vertical"/>
-          <a @click="handleRevertBatch">批量还原</a>
-          <a-divider type="vertical"/>
-          <a @click="handleDeleteBatch">批量删除</a>
-        </template>
-      </template>
-    </a-alert>
+<!--    <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
+<!--      <template slot="message">-->
+<!--        <span>已选择</span>-->
+<!--        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
+<!--        <span>项</span>-->
+<!--        <template v-if="selectedRowKeys.length>0">-->
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="handleClearSelection">清空选择</a>-->
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="handleRevertBatch">批量还原</a>-->
+<!--          <a-divider type="vertical"/>-->
+<!--          <a @click="handleDeleteBatch">批量删除</a>-->
+<!--        </template>-->
+<!--      </template>-->
+<!--    </a-alert>-->
 
     <a-table
       ref="table"