From f7cc97f27910c7d570f07df5d0dbd29d3f06049c Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期六, 12 十月 2024 15:14:27 +0800 Subject: [PATCH] 1、调整导航栏为侧边模式时的项目标题 2、调整页面顶部栏颜色 3、解决设备报警页面由于缩放引起的组件遮挡文字问题 4、总控车间看板右侧图表调整为自动轮播 5、分控车间看板每日生产计划仅展示3项,完整表格在右上角查看更多中查看 --- src/components/page/GlobalHeader.vue | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index 4463912..58c201e 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -17,7 +17,7 @@ :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/> - <span v-if="device === 'desktop'">娆㈣繋杩涘叆 Jeecg-Boot 浼佷笟绾т綆浠g爜骞冲彴</span> + <span v-if="device === 'desktop'">涓浗涓�鎷栭泦鍥㈡湁闄愬叕鍙�</span> <span v-else>Jeecg-Boot</span> <user-menu :theme="theme"/> @@ -59,7 +59,7 @@ components: { UserMenu, SMenu, - Logo, + Logo }, mixins: [mixin], props: { @@ -98,7 +98,7 @@ headerIndexRight: {}, topSmenuStyle: {} }, - chatStatus: '', + chatStatus: '' } }, watch: { @@ -152,7 +152,7 @@ } else { let rightWidth = '400px' this.topMenuStyle.topNavHeader = { 'min-width': '165px' } - this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' } + this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 240px)' } this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth, 'white-space': 'nowrap' } this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` } } @@ -163,7 +163,7 @@ // update-begin-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰� handleUpdateMenuTitle(value) { this.$emit('updateMenuTitle', value) - }, + } // update-end-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰� } @@ -223,5 +223,40 @@ } /* update_end author:scott date:20190220 for: 缂╁皬棣栭〉甯冨眬椤堕儴鐨勯珮搴�*/ + /deep/ .ant-menu { + background-color: #E74C3C; + color: #fff; + .ant-menu-submenu { + color: #fff; + } + .ant-menu-submenu:hover { + } + .ant-menu-submenu-title:hover { + color: #fff; + /*background-color: #F65B4B !important;*/ + } + .ant-menu-submenu-open { + /*background-color: #F65B4B !important;*/ + } + .ant-menu-submenu-selected { + color: #fff !important; + /*background-color: #F65B4B !important;*/ + } + .ant-menu-item { + a { + color: #fff; + &:hover { + color: #fff; + } + } + &.ant-menu-item-active { + /*background-color: #F65B4B;*/ + } + + &.ant-menu-item-selected { + /*background-color: #F65B4B;*/ + } + } + } </style> \ No newline at end of file -- Gitblit v1.9.3