From c5f905802ccbe457144045779702c5e9be274caa Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 20 Sep 2024 11:25:21 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E5=85=A8=E5=B1=80]=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=A1=88=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  3 ++-
 src/components/page/GlobalFooter.vue          |  7 +------
 src/components/page/GlobalLayout.vue          |  6 +++---
 src/components/tools/setting.js               |  3 ++-
 src/views/dashboard/Analysis.vue              | 21 ++++++-------------
 .../modules/SearchAndWarningCard.vue          |  2 +-
 6 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 7b7a6a6..21af682 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -2,8 +2,9 @@
 @user-info-height: var(--user-info-height, 59px);
 /*面包屑的高度，高度21，上下margin24 2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值*/
 @breadcrumb-height: var(--breadcrumb-height, 12px);
+@footer-height: var(--footer-height, 38px);
 /* 页面不出全局滚动条的高度，如果在vue文件使用，就只能在style里引入common.less */
-@page-content-h: calc(100vh - @user-info-height - @breadcrumb-height);
+@page-content-h: calc(100vh - @user-info-height - @breadcrumb-height - @footer-height);
 
 /*列表上方操作按钮区域*/
 /*.ant-card-body .table-operator {
diff --git a/src/components/page/GlobalFooter.vue b/src/components/page/GlobalFooter.vue
index 8953004..1cae944 100644
--- a/src/components/page/GlobalFooter.vue
+++ b/src/components/page/GlobalFooter.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="footer">
     <div class="links">
-    </div>
-    <div class="copyright">
-      Copyright
-      <a-icon type="copyright"/>
-      2022 <span></span>
+      <a href="//beian.miit.gov.cn/" target="_blank">&copy;奇瑞汽车股份有限公司 | 皖ICP备05009427号</a>
     </div>
   </div>
 </template>
@@ -19,7 +15,6 @@ export default {
 <style lang="less" scoped>
   .footer {
     padding: 0 16px;
-    margin: 48px 0 24px;
     text-align: center;
 
     .links {
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 4349e55..ed1c735 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -75,9 +75,9 @@
       </a-layout-content>
 
       <!-- layout footer -->
-      <!--      <a-layout-footer style="padding: 0">-->
-      <!--        <global-footer/>-->
-      <!--      </a-layout-footer>-->
+      <a-layout-footer style="padding: 0;background-color: transparent;">
+        <global-footer/>
+      </a-layout-footer>
     </a-layout>
 
     <!-- update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ---- -->
diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js
index 1c99758..86591ea 100644
--- a/src/components/tools/setting.js
+++ b/src/components/tools/setting.js
@@ -104,7 +104,8 @@ const updatePageHeight = () => {
   const obj = {
     'primary-color': '#0064FA',
     'user-info-height': isEmbedded ? '0px' : '59px', // 用户信息的高度
-    'breadcrumb-height': isEmbedded ? '0px' : '12px' // 面包屑的高度（2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值）
+    'breadcrumb-height': isEmbedded ? '0px' : '12px', // 面包屑的高度（2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值）
+    'footer-height': isEmbedded ? '0px' : '38px' // 底部版权信息
   }
   // 计算表格竖向滚动条使用
   const storeObj = Object.assign(obj, {
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 78609e4..1d2fe6e 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -13,8 +13,6 @@
     <friend-link-card class="home-link"></friend-link-card>
     <!--  列表  -->
     <search-and-warning-card class="home-table"></search-and-warning-card>
-    <!-- 备案 -->
-    <footer class="home-footer"><a href="//beian.miit.gov.cn/" target="_blank">&copy;奇瑞汽车股份有限公司 | 皖ICP备05009427号</a></footer>
   </div>
 </template>
 
@@ -36,20 +34,18 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
-@footerHeight: 30px;
 .all-wrapper {
   padding: 8px 8px 0;
   display: grid;
   width: 100%;
-  height: calc(100vh - 60px - 8px - 20px);
+  height: calc(100vh - 60px - 8px - 20px - 20px);
   grid-gap: 20px;
   grid-template-columns: 0.4fr 0.6fr;
-  grid-template-rows: 56px 180px minmax(200px, auto) 180px @footerHeight;
+  grid-template-rows: 56px 180px minmax(200px, auto) 180px;
   grid-template-areas: 'Search Search'
                        'QuickEntrance QuickEntrance'
                        'Todo Table'
-                       'Link Table'
-                       'Footer Footer';
+                       'Link Table';
 
   .home-search,
   .home-quick-entrance,
@@ -76,11 +72,6 @@ export default {
   .home-table {
     grid-area: Table;
   }
-  .home-footer {
-    line-height: @footerHeight;
-    grid-area: Footer;
-    text-align: center;
-  }
 }
 
 /deep/ .top-wrapper {
@@ -118,11 +109,11 @@ export default {
 }
 // 1366屏幕
 @media screen and (max-width: 1366px) {
-  @footerHeight: 50px;
   .all-wrapper {
-    height: calc(100vh - 60px - 8px - 20px + 200px + @footerHeight);
+    margin-bottom: 8px;
+    height: calc(100vh - 60px - 8px - 20px + 200px);
     // 友情链接部分减少了12像素
-    grid-template-rows: 48px 180px minmax(200px, auto) 168px @footerHeight;
+    grid-template-rows: 48px 180px minmax(200px, auto) 168px;
   }
   /deep/ .top-wrapper {
     .left-p {
diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue
index 7543cab..15a7050 100644
--- a/src/views/dashboard/modules/SearchAndWarningCard.vue
+++ b/src/views/dashboard/modules/SearchAndWarningCard.vue
@@ -12,7 +12,7 @@
         size="middle"
         :rowKey="(_, index) => index"
         class="table"
-        :scroll="{ x: '100%', y: 'calc(100vh - 600px)' }"
+        :scroll="{ x: '100%', y: 'calc(100vh - 570px)' }"
         :columns="showColumns"
         :dataSource="dataSource"
         :pagination="ipagination"