diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue index 7fca9e2..e67918b 100644 --- a/hx-ai-intelligent/src/App.vue +++ b/hx-ai-intelligent/src/App.vue @@ -51,28 +51,32 @@ height: 100%; } - :deep(.ns-left-menu .firstMenuItem-selected .ant-menu-title-content) { + :deep(.ant-menu-title-content) { background: unset !important; + z-index: 9 !important; } :deep(.ns-left-menu) { - .ant-menu-item-active, - .ant-submenu-item-active { - background: #ecf3ff !important; - } - .ant-menu-item-selected .ant-menu-title-content { + .ant-menu-item-selected { // color: #fff !important; background: @primary-color; border-radius: 12px; - height: 40px; - line-height: 40px; + // height: 40px; + // line-height: 40px; + padding: 5px @ns-gap; + position: relative; a { color: @white !important; } } + + .ant-menu-item-active, + .ant-submenu-item-active { + // color: rgba(@primary-color, 0.1) !important; + } } :deep(.ant-menu-light.ant-menu-horizontal > .ant-menu-item:hover) { - background: @primary-color; + // background: @primary-color; } // :deep(.ant-menu-inline .ant-menu-submenu-title) { // color: rgba(255, 255, 255, 0.9) !important; diff --git a/hx-ai-intelligent/src/icon/shebeiguanli.svg b/hx-ai-intelligent/src/icon/shebeiguanli.svg index cf0a1e2..645ee62 100644 --- a/hx-ai-intelligent/src/icon/shebeiguanli.svg +++ b/hx-ai-intelligent/src/icon/shebeiguanli.svg @@ -1,4 +1,4 @@ - - + + diff --git a/hx-ai-intelligent/src/icon/shebeiqunkong.svg b/hx-ai-intelligent/src/icon/shebeiqunkong.svg index c069283..1172600 100644 --- a/hx-ai-intelligent/src/icon/shebeiqunkong.svg +++ b/hx-ai-intelligent/src/icon/shebeiqunkong.svg @@ -1,4 +1,4 @@ - + diff --git a/hx-ai-intelligent/src/icon/zuzhiguanli.svg b/hx-ai-intelligent/src/icon/zuzhiguanli.svg index d65cf2d..95feef4 100644 --- a/hx-ai-intelligent/src/icon/zuzhiguanli.svg +++ b/hx-ai-intelligent/src/icon/zuzhiguanli.svg @@ -1,4 +1,4 @@ - + diff --git a/hx-ai-intelligent/src/theme/global.less b/hx-ai-intelligent/src/theme/global.less index 97f7887..7271933 100644 --- a/hx-ai-intelligent/src/theme/global.less +++ b/hx-ai-intelligent/src/theme/global.less @@ -11,10 +11,11 @@ // .ant-menu-dark.ant-menu-horizontal>.ant-menu-item:hover { // background-color: #43BB79 !important; // } - + .ant-menu-inline .ant-menu-item, .ant-menu-inline .ant-menu-submenu-title { - width: 100% !important; + max-width: 100% !important; + transition: none !important; } .ns-basic-table .ant-btn:hover { @@ -46,17 +47,17 @@ } // header菜单字体样式 -.ant-menu-dark.ant-menu-horizontal>.ant-menu-item, -.ant-menu-dark.ant-menu-horizontal>.ant-menu-submenu { - color: #fff; -} +// .ant-menu-dark.ant-menu-horizontal>.ant-menu-item, +// .ant-menu-dark.ant-menu-horizontal>.ant-menu-submenu { +// color: #fff; +// } -.ant-menu-dark .ant-menu-item, -.ant-menu-dark .ant-menu-item-group-title, -.ant-menu-dark .ant-menu-item>a, -.ant-menu-dark .ant-menu-item>span>a { - color: #fff; -} +// .ant-menu-dark .ant-menu-item, +// .ant-menu-dark .ant-menu-item-group-title, +// .ant-menu-dark .ant-menu-item>a, +// .ant-menu-dark .ant-menu-item>span>a { +// color: #fff; +// } @font-face { /*给字体命名*/ diff --git a/lib/saas/theme/global-antd.less b/lib/saas/theme/global-antd.less index caaffce..7744923 100644 --- a/lib/saas/theme/global-antd.less +++ b/lib/saas/theme/global-antd.less @@ -28,7 +28,7 @@ #app .ant-layout-has-sider .ant-menu-vertical .ant-menu-item,#app .ant-menu-vertical-left .ant-menu-item, #app.ant-menu-vertical-right .ant-menu-item,#app .ant-menu-inline .ant-menu-item,#app .ant-menu-vertical .ant-menu-submenu-title,#app .ant-menu-vertical-left .ant-menu-submenu-title,#app .ant-menu-vertical-right .ant-menu-submenu-title,#app .ant-menu-inline .ant-menu-submenu-title { margin-top: 0px !important; margin-bottom: 0px !important; - height: 50px !important; + // height: 50px !important; } .ant-menu-vertical.ant-menu-sub, .ant-menu-vertical-left.ant-menu-sub, .ant-menu-vertical-right.ant-menu-sub{ diff --git a/lib/saas/theme/global.less b/lib/saas/theme/global.less index e5f1ca1..4ce5138 100644 --- a/lib/saas/theme/global.less +++ b/lib/saas/theme/global.less @@ -137,6 +137,9 @@ body { height: 100%; } +a { + transition: color 0.08s; +} .ant-layout-sider-children { overflow: auto; } @@ -162,7 +165,7 @@ body { //状态颜色 .commonStatus { - &::before{ + &::before { content: ''; width: 8px; height: 8px; @@ -174,60 +177,60 @@ body { } .statusWarn { - &::before{ + &::before { background-color: #fa8214; } } .statusSuccess { - &::before{ - background-color: #0D9E3E; + &::before { + background-color: #0d9e3e; } } .statusRunning { - &::before{ - background-color: #1C4DDC; + &::before { + background-color: #1c4ddc; } } .statusError { - &::before{ - background-color: #D4321C; + &::before { + background-color: #d4321c; } } .statusEmpty { - &::before{ - width:0; + &::before { + width: 0; } - width:0; + width: 0; } .statusNotStart { - &::before{ - background-color: #8B98AB; + &::before { + background-color: #8b98ab; } } -.statusDone{ - &::before{ +.statusDone { + &::before { background-color: #697383; } } -.statusInvalid{ - &::before{ - background-color: #AEAEAE; +.statusInvalid { + &::before { + background-color: #aeaeae; } } .statusNull { - &::before{ - background-color: #8B98AB; + &::before { + background-color: #8b98ab; } // background-color: #8B98AB; -}/* */ -.statusNull2{ - &::before{ +} /* */ +.statusNull2 { + &::before { background-color: #697383; } // background-color: #697383; diff --git a/lib/saas/theme/variable.less b/lib/saas/theme/variable.less index 0b04534..7165bb8 100644 --- a/lib/saas/theme/variable.less +++ b/lib/saas/theme/variable.less @@ -41,7 +41,7 @@ @form-item-margin-bottom: 24px; //menu -@menu-item-height: 48px; +@menu-item-height: 50px; @menu-item-active-bg: none; @menu-item-boundary-margin: 0px; diff --git a/lib/saas/view/service/list-table.vue b/lib/saas/view/service/list-table.vue index e949ceb..15ee99d 100644 --- a/lib/saas/view/service/list-table.vue +++ b/lib/saas/view/service/list-table.vue @@ -106,7 +106,10 @@ @gap: 16px; @border-gap: @gap solid #e5ebf0; :deep(.ns-table-container) { - border-top: @border-gap; + // border-top: @border-gap; + .ns-table-search { + border-radius: @ns-border-radius; + } } :deep(.ns-table) { diff --git a/lib/saas/view/system/layout/sider.vue b/lib/saas/view/system/layout/sider.vue index 732756d..9b0c963 100644 --- a/lib/saas/view/system/layout/sider.vue +++ b/lib/saas/view/system/layout/sider.vue @@ -13,7 +13,7 @@ {{ $refs.getComputedStyle }} - + {{ item.meta.title }} @@ -47,8 +47,11 @@ - - {{ sitem.meta.title }} + + + + + {{ sitem?.meta?.title }} @@ -71,12 +70,8 @@ v-if="ditem.children !== undefined && !ditem.isHide" :key="ditem.name"> @@ -88,18 +83,21 @@ initSiderKey.includes(fiveFloorItem.name) ? 'ant-menu-item-selected' : '' " v-if="fiveFloorItem.meta?.type !== 'op'"> - - {{ fiveFloorItem?.meta?.title ? fiveFloorItem?.meta?.title : '' }} + + {{ fiveFloorItem?.meta?.title ? fiveFloorItem?.meta?.title : '' }}123 - {{ - ditem?.meta?.title ? ditem?.meta?.title : '' - }} + + + + + + {{ ditem?.meta?.title }}123 + + @@ -115,9 +113,9 @@ :key="item.name"> - + - {{ item.meta.title }} + {{ item.meta.title }} @@ -219,6 +217,7 @@