diff --git a/src/components/Menu/index.ts b/src/components/Menu/index.ts index ffded56..0dde8e2 100644 --- a/src/components/Menu/index.ts +++ b/src/components/Menu/index.ts @@ -1,5 +1,3 @@ import BasicMenu from './src/BasicMenu.vue'; -import BasicMenu1 from './src/BasicMenu1.vue'; -import BasicMenu2 from './src/BasicMenu2.vue'; -export { BasicMenu, BasicMenu1, BasicMenu2 }; +export { BasicMenu}; diff --git a/src/components/Menu/src/BasicMenu.vue b/src/components/Menu/src/BasicMenu.vue index fe1fbf3..0142fe4 100644 --- a/src/components/Menu/src/BasicMenu.vue +++ b/src/components/Menu/src/BasicMenu.vue @@ -1,17 +1,160 @@ - + diff --git a/src/components/Menu/src/BasicMenu1.vue b/src/components/Menu/src/BasicMenu1.vue deleted file mode 100644 index e584b89..0000000 --- a/src/components/Menu/src/BasicMenu1.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - diff --git a/src/components/Menu/src/BasicMenu2.vue b/src/components/Menu/src/BasicMenu2.vue deleted file mode 100644 index c52d644..0000000 --- a/src/components/Menu/src/BasicMenu2.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less index 86d9128..ca2e6cf 100644 --- a/src/components/Menu/src/index.less +++ b/src/components/Menu/src/index.less @@ -8,7 +8,6 @@ width: 100%; .ant-menu-item { - color: #000000; transition: unset; } @@ -30,11 +29,7 @@ .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, .ant-menu-submenu-active, .ant-menu-submenu-title:hover { - font-size: 17px; - font-weight: bold; - color: #5473e8; - //background-color: @top-menu-active-bg-color !important; - background-color: #dfe7f5 !important; + background-color: @top-menu-active-bg-color !important; } .ant-menu-item:hover, @@ -76,13 +71,13 @@ transition: unset; } } -.ant-menu-item-selected { - &::after { - position: absolute !important; - left: 20px !important; - bottom: 29% !important; - width: calc(100% - 40px); - height: 3px; - background: #5473e8; - } -} +//.ant-menu-item-selected { +// &::after { +// position: absolute !important; +// left: 20px !important; +// bottom: 29% !important; +// width: calc(100% - 40px); +// height: 3px; +// background: #5473e8; +// } +//} diff --git a/src/components/Menu/src/index1.less b/src/components/Menu/src/index1.less deleted file mode 100644 index 369c345..0000000 --- a/src/components/Menu/src/index1.less +++ /dev/null @@ -1,91 +0,0 @@ -@basic-menu-prefix-cls: ~'@{namespace}-basic-menu'; - -.yt { - .app-top-menu-popup { - min-width: 150px; - } - - .@{basic-menu-prefix-cls} { - width: 100%; - - .ant-menu-item { - color: #000000; - transition: unset; - } - - &__sidebar-hor { - &.ant-menu-horizontal { - display: flex; - align-items: center; - - &.ant-menu-dark { - background-color: transparent; - - .ant-menu-submenu:hover, - .ant-menu-item-open, - .ant-menu-submenu-open, - .ant-menu-item-selected, - .ant-menu-submenu-selected, - .ant-menu-item:hover, - .ant-menu-item-active, - .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, - .ant-menu-submenu-active, - .ant-menu-submenu-title:hover { - font-size: 17px; - font-weight: bold; - color: #5473e8; - //background-color: @top-menu-active-bg-color !important; - background-color: #dfe7f5 !important; - } - - .ant-menu-item:hover, - .ant-menu-item-active, - .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, - .ant-menu-submenu-active, - .ant-menu-submenu-title:hover { - background-color: @top-menu-active-bg-color; - } - - .@{basic-menu-prefix-cls}-item__level1 { - background-color: transparent; - - &.ant-menu-item-selected, - &.ant-menu-submenu-selected { - background-color: @top-menu-active-bg-color !important; - } - } - - .ant-menu-item, - .ant-menu-submenu { - &.@{basic-menu-prefix-cls}-item__level1, - .ant-menu-submenu-title { - height: @header-height; - line-height: @header-height; - } - } - } - } - } - - .ant-menu-submenu, - .ant-menu-submenu-inline { - transition: unset; - } - - .ant-menu-inline.ant-menu-sub { - box-shadow: unset !important; - transition: unset; - } - } - .ant-menu-item-selected { - &::after { - position: absolute !important; - left: 20px !important; - bottom: 29% !important; - width: calc(100% - 40px); - height: 3px; - background: #5473e8; - } - } - -} diff --git a/src/components/Menu/src/index2.less b/src/components/Menu/src/index2.less deleted file mode 100644 index 2b92c6a..0000000 --- a/src/components/Menu/src/index2.less +++ /dev/null @@ -1,86 +0,0 @@ -@basic-menu-prefix-cls: ~'@{namespace}-basic-menu'; - -.qh { - .app-top-menu-popup { - min-width: 150px; - } - - .@{basic-menu-prefix-cls} { - width: 100%; - - .ant-menu-item { - transition: unset; - } - - &__sidebar-hor { - &.ant-menu-horizontal { - display: flex; - align-items: center; - - &.ant-menu-dark { - background-color: transparent; - - .ant-menu-submenu:hover, - .ant-menu-item-open, - .ant-menu-submenu-open, - .ant-menu-item-selected, - .ant-menu-submenu-selected, - .ant-menu-item:hover, - .ant-menu-item-active, - .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, - .ant-menu-submenu-active, - .ant-menu-submenu-title:hover { - //color: #5473e8; - background-color: @top-menu-active-bg-color !important; - } - - .ant-menu-item:hover, - .ant-menu-item-active, - .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, - .ant-menu-submenu-active, - .ant-menu-submenu-title:hover { - background-color: @top-menu-active-bg-color; - } - - .@{basic-menu-prefix-cls}-item__level1 { - background-color: transparent; - - &.ant-menu-item-selected, - &.ant-menu-submenu-selected { - background-color: @top-menu-active-bg-color !important; - } - } - - .ant-menu-item, - .ant-menu-submenu { - &.@{basic-menu-prefix-cls}-item__level1, - .ant-menu-submenu-title { - height: @header-height; - line-height: @header-height; - } - } - } - } - } - - .ant-menu-submenu, - .ant-menu-submenu-inline { - transition: unset; - } - - .ant-menu-inline.ant-menu-sub { - box-shadow: unset !important; - transition: unset; - } - } - .ant-menu-item-selected { - &::after { - position: absolute !important; - left: 0 !important; - bottom: 0 !important; - width: 100%; - height: 5px; - background: #5473e8; - } - } -} diff --git a/src/layouts/default/header/MultipleHeader.vue b/src/layouts/default/header/MultipleHeader.vue index cac997b..6b9520b 100644 --- a/src/layouts/default/header/MultipleHeader.vue +++ b/src/layouts/default/header/MultipleHeader.vue @@ -22,7 +22,7 @@ import { useUserStore } from '/@/store/modules/user'; import { getEnvInfo } from '/@/utils/getEnv'; - const HEADER_HEIGHT = getEnvInfo().VITE_PLATFORM === 'YT' ? 60 : 80; + const HEADER_HEIGHT = 80; // updateBy:sunjianlei---updateDate:2021-09-03---修改tab切换栏样式:更改高度 const TABS_HEIGHT = 32; @@ -45,7 +45,8 @@ const { getShowMultipleTab, getTabsTheme } = useMultipleTabSetting(); const HEADER_HEIGHT_SPECIAL_PATH = ref( - getEnvInfo().VITE_PLATFORM === 'YT' && !['2', '4', '5', '6'].includes(useUserStore().getUserInfo.personType) ? 50 : 0 + // getEnvInfo().VITE_PLATFORM === 'YT' && !['2', '4', '5', '6'].includes(useUserStore().getUserInfo.personType) ? 50 : 0 + 0 ); const getShowTabs = computed(() => { diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index d6d0345..53496ce 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -2,10 +2,6 @@
diff --git a/src/layouts/default/index.vue b/src/layouts/default/index.vue index 3b46f70..47fc28e 100644 --- a/src/layouts/default/index.vue +++ b/src/layouts/default/index.vue @@ -3,8 +3,6 @@