From b58f1e89c1ac45578ab9c1a0549978929b1aa4a2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Sat, 12 Oct 2024 10:25:56 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=95=B4=E4=BD=93=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=87=E9=A2=98]=20?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=B0=83=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less           | 2 +-
 src/components/InternalDetailPage.vue | 2 +-
 src/components/menu/SideMenu.vue      | 2 +-
 src/components/page/GlobalHeader.vue  | 2 +-
 src/components/page/GlobalLayout.vue  | 8 ++++----
 src/components/tools/HeaderNotice.vue | 3 +++
 src/components/tools/setting.js       | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 17b838c..9681cf2 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -1,5 +1,5 @@
 /*用户信息部分的高度*/
-@user-info-height: var(--user-info-height, 59px);
+@user-info-height: var(--user-info-height, 46px);
 /*面包屑的高度，高度21，上下margin24 2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值*/
 @breadcrumb-height: var(--breadcrumb-height, 12px);
 @footer-height: var(--footer-height, 38px);
diff --git a/src/components/InternalDetailPage.vue b/src/components/InternalDetailPage.vue
index edccef9..6668608 100644
--- a/src/components/InternalDetailPage.vue
+++ b/src/components/InternalDetailPage.vue
@@ -91,7 +91,7 @@ export default {
 }
 
 .page-title {
-  height: 56px;
+  height: 46px;
   border-bottom: 1px solid #E5E6EB;
   padding: 0 24px;
   display: flex;
diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue
index a437c51..fb48271 100644
--- a/src/components/menu/SideMenu.vue
+++ b/src/components/menu/SideMenu.vue
@@ -60,7 +60,7 @@ export default {
     smenuStyle () {
       const style = { padding: '0' }
       if (this.fixSiderbar) {
-        style.height = 'calc(100% - 59px)'
+        style.height = 'calc(100% - 46px)'
         style.overflow = 'auto'
         style['overflow-x'] = 'hidden'
       }
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index b3f5b37..795bd07 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -169,7 +169,7 @@ export default {
 <style lang="less" scoped>
 /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-@height: 59px;
+@height: 46px;
 
 .layout {
 
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 52b3fe0..b324511 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -70,7 +70,7 @@
       />
 
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '46px' : '0' }">
         <slot></slot>
       </a-layout-content>
 
@@ -351,7 +351,7 @@ body {
   }
 
   .header {
-    height: 64px;
+    height: 46px;
     padding: 0 12px 0 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
@@ -487,7 +487,7 @@ body {
       margin: auto;
       padding: 0 20px 0 0;
       display: flex;
-      height: 59px;
+      height: 46px;
 
       .ant-menu.ant-menu-horizontal {
         border: none;
@@ -526,7 +526,7 @@ body {
 
       .header-index-right {
         float: right;
-        height: 59px;
+        height: 46px;
         overflow: hidden;
 
         .action:hover {
diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 0621974..62bdcf4 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -299,6 +299,9 @@ export default {
   span {
     vertical-align: initial;
   }
+  /deep/ .ant-badge-count {
+    transform: scale(0.8) translate(40%, -40%);
+  }
 }
 .header-notice-btn {
   width: 32px;
diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js
index 86591ea..9e31e4a 100644
--- a/src/components/tools/setting.js
+++ b/src/components/tools/setting.js
@@ -103,7 +103,7 @@ const updatePageHeight = () => {
   const isEmbedded = store.getters.isEmbedded
   const obj = {
     'primary-color': '#0064FA',
-    'user-info-height': isEmbedded ? '0px' : '59px', // 用户信息的高度
+    'user-info-height': isEmbedded ? '0px' : '46px', // 用户信息的高度
     'breadcrumb-height': isEmbedded ? '0px' : '12px', // 面包屑的高度（2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值）
     'footer-height': isEmbedded ? '0px' : '38px' // 底部版权信息
   }