From d6f59523a51a35fe1fa5eb9e4eb0de8785bb96f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 6 Dec 2023 15:58:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=9D=A2=E5=8C=85=E5=B1=91=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less          |  4 +-
 src/components/layouts/TabLayout.vue |  5 +-
 src/components/page/GlobalHeader.vue | 89 +++++++++++++++-------------
 src/components/tools/setting.js      |  2 +-
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 29888094..74a41771 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -1,7 +1,7 @@
 /*用户信息部分的高度*/
 @user-info-height: var(--user-info-height, 59px);
-/*面包屑的高度，高度21，上下margin24*/
-@breadcrumb-height: var(--breadcrumb-height, 45px);
+/*面包屑的高度，高度21，上下margin24 2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值*/
+@breadcrumb-height: var(--breadcrumb-height, 12px);
 /* 页面不出全局滚动条的高度，如果在vue文件使用，就只能在style里引入common.less */
 @page-content-h: calc(100vh - @user-info-height - @breadcrumb-height);
 
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index aea32806..2637006e 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -20,7 +20,6 @@
       <!--  </a-tab-pane>-->
       <!--</a-tabs>-->
 
-      <breadcrumb v-if="!isEmbedded"/>
       <div :style="!isEmbedded ? 'margin: 12px 12px 0;' : ''">
         <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
         <keep-alive v-if="multipage">
@@ -44,7 +43,6 @@ import { triggerWindowResizeEvent } from '@/utils/util'
 import Vue from 'vue'
 import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
 import BlankLayout from './BlankLayout.vue'
-import Breadcrumb from '../tools/Breadcrumb.vue'
 import { mapState } from 'vuex'
 
 const indexKey = '/'
@@ -54,8 +52,7 @@ export default {
   components: {
     BlankLayout,
     GlobalLayout,
-    Contextmenu,
-    Breadcrumb
+    Contextmenu
   },
   mixins: [mixin, mixinDevice],
   data () {
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 9be52332..dd708c88 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -15,18 +15,17 @@
         v-else
         class="trigger"
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
-        @click="toggle"/>
+        @click="toggle" />
 
-      <span v-if="device === 'desktop'">中国重汽标准法规管理模块系统</span>
-      <span v-else>Jero-Boot</span>
+      <breadcrumb v-if="!isEmbedded" class="breadcrumb" />
 
-      <user-menu :theme="theme"/>
+      <user-menu :theme="theme" />
     </div>
     <!-- 顶部导航栏模式 -->
     <div v-else :class="['top-nav-header-index', theme]">
       <div class="header-index-wide">
         <div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
-          <logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
+          <logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader" />
           <div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
             <s-menu
               mode="horizontal"
@@ -41,7 +40,7 @@
             :type="collapsed ? 'menu-fold' : 'menu-unfold'"
             @click="toggle"></a-icon>
         </div>
-        <user-menu class="header-index-right" :theme="theme" :style="topMenuStyle.headerIndexRight"/>
+        <user-menu class="header-index-right" :theme="theme" :style="topMenuStyle.headerIndexRight" />
       </div>
     </div>
 
@@ -53,10 +52,12 @@ import UserMenu from '../tools/UserMenu'
 import SMenu from '../menu/'
 import Logo from '../tools/Logo'
 import { mixin } from '@/utils/mixin.js'
+import Breadcrumb from '../tools/Breadcrumb'
 
 export default {
   name: 'GlobalHeader',
   components: {
+    Breadcrumb,
     UserMenu,
     SMenu,
     Logo
@@ -166,57 +167,63 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
+/* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-  @height: 59px;
+@height: 59px;
 
-  .layout {
+.layout {
 
-    .top-nav-header-index {
+  .top-nav-header-index {
 
-      .header-index-wide {
-        margin-left: 10px;
+    .header-index-wide {
+      margin-left: 10px;
 
-        .ant-menu.ant-menu-horizontal {
-          height: @height;
-          line-height: @height;
-        }
-      }
-      .trigger {
-        line-height: 64px;
-        &:hover {
-          background: rgba(0, 0, 0, 0.05);
-        }
+      .ant-menu.ant-menu-horizontal {
+        height: @height;
+        line-height: @height;
       }
     }
 
-    .header {
-      z-index: 2;
-      color: #1D2129;
-      height: @height;
-      background-color: white;
-      transition: background 300ms;
+    .trigger {
+      line-height: 64px;
 
-      /* dark 样式 */
-      &.dark {
-        color: #000000;
-        box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
-        background-color: white !important;
-      }
-    }
-
-    .header, .top-nav-header-index {
-      &.dark .trigger:hover {
+      &:hover {
         background: rgba(0, 0, 0, 0.05);
       }
     }
   }
 
-  .ant-layout-header {
+  .header {
+    z-index: 2;
+    color: #1D2129;
     height: @height;
-    line-height: @height;
+    background-color: white;
+    transition: background 300ms;
+
+    /* dark 样式 */
+
+    &.dark {
+      color: #000000;
+      box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
+      background-color: white !important;
+    }
   }
 
-  /* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
+  .header, .top-nav-header-index {
+    &.dark .trigger:hover {
+      background: rgba(0, 0, 0, 0.05);
+    }
+  }
+}
 
+.ant-layout-header {
+  height: @height;
+  line-height: @height;
+}
+
+/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
+.breadcrumb {
+  display: inline-block;
+  margin: 0;
+}
 </style>
diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js
index 4ebf472a..dc84cc34 100644
--- a/src/components/tools/setting.js
+++ b/src/components/tools/setting.js
@@ -104,7 +104,7 @@ const updatePageHeight = () => {
   const obj = {
     'primary-color': '#D52C26',
     'user-info-height': isEmbedded ? '0px' : '59px', // 用户信息的高度
-    'breadcrumb-height': isEmbedded ? '0px' : '45px' // 面包屑的高度
+    'breadcrumb-height': isEmbedded ? '0px' : '12px' // 面包屑的高度（2023-12-06，面包屑挪到用户信息那一栏了，现在12px是margin的数值）
   }
   // 计算表格竖向滚动条使用
   const storeObj = Object.assign(obj, {