From 1369e972ef55fbcc565cf25f03b6a0f9be438282 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 20 Nov 2024 11:44:45 +0800
Subject: [PATCH] 11.20

---
 .../EventMarketing/newCertificate/index.vue   |  2 +-
 fuintAdmin_zt/src/views/setting/sysLog.vue    | 18 +++-------------
 .../views/system/notify/page/getNotify.vue    |  1 +
 .../src/views/system/notify/page/mode.vue     | 21 ++++++++++---------
 .../src/views/system/notify/page/record.vue   |  2 +-
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index ae5e4bf42..7a6328bd7 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -1309,7 +1309,7 @@ export default {
 }
 .box-der {
   box-sizing: border-box;
-  padding: 15px;
+  padding: 10px;
 }
 
 .kar {
diff --git a/fuintAdmin_zt/src/views/setting/sysLog.vue b/fuintAdmin_zt/src/views/setting/sysLog.vue
index b40432644..1e16f913a 100644
--- a/fuintAdmin_zt/src/views/setting/sysLog.vue
+++ b/fuintAdmin_zt/src/views/setting/sysLog.vue
@@ -1,26 +1,14 @@
 <template>
   <div class="app-container" style="padding: 0px">
 
-<!--<<<<<<< HEAD-->
+
     <div class="tab-box">
       <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index,handleClick2()" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
     </div>
 
 
 
-    <div class="card-change"  style="margin: 20px">
-<!--      <el-tabs v-model="activeName" @tab-click="handleClick">-->
-<!--        <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
-<!--        <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
-<!--      </el-tabs>-->
-
-<!--=======-->
-<!--    <el-card >-->
-<!--      <el-tabs v-model="activeName" @tab-click="handleClick">-->
-<!--        <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
-<!--        <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
-<!--      </el-tabs>-->
-<!--&gt;>>>>>> d25f5b521c8a75cc04591397604acc7d4a5eb604-->
+    <div class="card-change"  style="margin: 10px;margin-bottom: 0px">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
         <el-form-item label="" prop="createName">
           <el-input
@@ -85,7 +73,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 65vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto;scrollbar-width:none;  ">
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="createAccount" label="登录账号"></el-table-column>
diff --git a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
index 430bd180f..c60167a77 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
@@ -311,6 +311,7 @@ export default {
 }
 .app-container{
   padding: 10px;
+  padding-bottom: 0px;
 }
 .table-box{
   width: 100%;
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index 1140d3a68..e65ba0752 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container" style="padding: 10px">
-    <div class="card-change" style="min-height: 80vh;">
+  <div class="app-container" style="padding: 10px;padding-bottom: 0px">
+    <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="notificationName">
           <el-input
@@ -74,14 +74,15 @@
           </template>
         </el-table-column>
       </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+
 
     </div>
 
@@ -489,7 +490,7 @@ export default {
 }
 .table_box{
   width: 100%;
-  height: 70vh;
+  height: 74vh;
 }
 </style>
 
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index 62e2b08ad..10b8bdec4 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style="padding: 10px">
+  <div class="app-container" style="padding: 10px;padding-bottom: 0px">
     <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">