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 @@
-
@@ -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" />
- 中国重汽标准法规管理模块系统
- Jero-Boot
+
-
+
@@ -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 {
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, {