diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss b/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss index 6ffcd336..e591eea2 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss @@ -17,10 +17,10 @@ transition: width 0.28s; width: $base-sidebar-width !important; background-color: $base-menu-background; - height: 100%; + height: calc(100% - 50px); position: fixed; font-size: 0; - top: 0; + top: 50px; bottom: 0; left: 0; z-index: 1001; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/components/Breadcrumb/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/components/Breadcrumb/index.vue index a9cdef42..9b21903d 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/components/Breadcrumb/index.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/components/Breadcrumb/index.vue @@ -33,10 +33,6 @@ const getBreadcrumb = () => { } else { matched = route.matched.filter((item) => item.meta && item.meta.title); } - // 判断是否为首页 - if (!isDashboard(matched[0])) { - matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched); - } levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false); }; const findPathNum = (str, char = '/') => { @@ -53,13 +49,6 @@ const getMatched = (pathList, routeList, matched) => { } } }; -const isDashboard = (route: RouteLocationMatched) => { - const name = route && (route.name as string); - if (!name) { - return false; - } - return name.trim() === 'Index'; -}; const handleLink = (item) => { const { redirect, path } = item; redirect ? router.push(redirect) : router.push(path); diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/components/TopNav/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/components/TopNav/index.vue index a7345fe6..85a9c707 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/components/TopNav/index.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/components/TopNav/index.vue @@ -32,7 +32,7 @@ const visibleNumber = ref(-1); // 当前激活菜单的 index const currentIndex = ref(); // 隐藏侧边栏路由 -const hideList = ['/index', '/user/profile']; +const hideList = ['/home', '/index', '/user/profile']; const appStore = useAppStore(); const settingsStore = useSettingsStore(); @@ -85,7 +85,7 @@ const childrenMenus = computed(() => { // 默认激活的菜单 const activeMenu = computed(() => { let path = route.path; - if (path === '/index') { + if (path === '/home' || path === '/index') { path = '/system/user'; } let activePath = path; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue index b6c7b61c..78096d5d 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue @@ -53,7 +53,7 @@ function addIframe() { diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue index 76a0eed8..42d818c8 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue @@ -1,23 +1,29 @@