From b90805cb6bfa0a4e447643c171414a2224d714de Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 3 Aug 2023 15:05:08 +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/components/layouts/RouteView.vue      |  6 ++++--
 jero-web/src/components/page/GlobalFooter.vue      |  4 ++--
 jero-web/src/components/page/GlobalLayout.vue      |  4 +++-
 .../modules/message/SysMessageTemplateList.vue     | 14 +++++++-------
 jero-web/src/views/system/SysAnnouncementList.vue  | 12 ++++++------
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/components/layouts/RouteView.vue b/jero-web/src/components/layouts/RouteView.vue
index 1b7a3149..62c53d4a 100644
--- a/jero-web/src/components/layouts/RouteView.vue
+++ b/jero-web/src/components/layouts/RouteView.vue
@@ -38,7 +38,9 @@ export default {
 </script>
 <style>
   .main{
-    height: 100%;
-    overflow: auto;
+    height: calc(100% - 100px);
+    overflow-y: auto;
+    overflow-x: hidden;
+
   }
 </style>
diff --git a/jero-web/src/components/page/GlobalFooter.vue b/jero-web/src/components/page/GlobalFooter.vue
index d1ee463d..341033f8 100644
--- a/jero-web/src/components/page/GlobalFooter.vue
+++ b/jero-web/src/components/page/GlobalFooter.vue
@@ -23,8 +23,8 @@ export default {
 
 <style lang="less" scoped>
   .footer {
-    padding: 0 16px;
-    margin: 48px 0 24px;
+    //padding: 0 16px;
+    //margin: 48px 0 24px;
     text-align: center;
 
     .links {
diff --git a/jero-web/src/components/page/GlobalLayout.vue b/jero-web/src/components/page/GlobalLayout.vue
index df4104c5..f83661b4 100644
--- a/jero-web/src/components/page/GlobalLayout.vue
+++ b/jero-web/src/components/page/GlobalLayout.vue
@@ -197,7 +197,9 @@ export default {
       filter: invert(80%);
     }
   }
-
+  .ant-card-body {
+      padding: 24px 24px 0 !important;
+  }
   .layout {
     min-height: 100vh !important;
     overflow-x: hidden;
diff --git a/jero-web/src/views/modules/message/SysMessageTemplateList.vue b/jero-web/src/views/modules/message/SysMessageTemplateList.vue
index 4a7e38fd..4395c3f7 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">新增</a-button>
-      <a-button type="default" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
+      <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="default" icon="import">导入</a-button>
+        <a-button type="default" icon="import" v-has="'message:template: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"> 批量操作
+        <a-button style="margin-left: 8px" v-has="'message:template:batchdel'"> 批量操作
           <a-icon type="down"/>
         </a-button>
       </a-dropdown>
@@ -85,18 +85,18 @@
         </span>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'message:template:edit'">编辑</a>
 
           <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-              <a-menu-item>
+              <a-menu-item  v-has="'message:template:del'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item  v-has="'message:template:send'">
                   <a @click="handleTest(record)">发送测试</a>
               </a-menu-item>
             </a-menu>
diff --git a/jero-web/src/views/system/SysAnnouncementList.vue b/jero-web/src/views/system/SysAnnouncementList.vue
index 7369536b..0eb066b4 100644
--- a/jero-web/src/views/system/SysAnnouncementList.vue
+++ b/jero-web/src/views/system/SysAnnouncementList.vue
@@ -24,7 +24,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" v-has="'annount:cement:add'">新增</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -58,23 +58,23 @@
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a  v-if="(record.sendStatus + '') === '0'" @click="handleEdit(record)">编辑</a>
+          <a v-has="'annount:cement:edit'"  v-if="(record.sendStatus + '') === '0'" @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" v-if="(record.sendStatus + '') === '0'"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-              <a-menu-item v-if="(record.sendStatus + '') !== '1'">
+              <a-menu-item v-if="(record.sendStatus + '') !== '1'" v-has="'annount:cement:del'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a >删除</a>
                 </a-popconfirm>
               </a-menu-item>
-              <a-menu-item v-if="(record.sendStatus + '') === '0'">
+              <a-menu-item v-if="(record.sendStatus + '') === '0'" v-has="'annount:cement:send'">
                 <a-popconfirm title="确定发布吗?" @confirm="() => releaseData(record.id)">
                   <a>发布</a>
                 </a-popconfirm>
               </a-menu-item>
-              <a-menu-item v-if="(record.sendStatus + '') === '1'">
+              <a-menu-item v-if="(record.sendStatus + '') === '1'" v-has="'annount:cement:reback'">
                 <a-popconfirm title="确定撤销吗?" @confirm="() => reovkeData(record.id)">
                   <a>撤销</a>
                 </a-popconfirm>