diff --git a/src/assets/svg/icons/treeNodeLineSelected.svg b/src/assets/svg/icons/treeNodeLineSelected.svg index 6353031..f810ebe 100644 --- a/src/assets/svg/icons/treeNodeLineSelected.svg +++ b/src/assets/svg/icons/treeNodeLineSelected.svg @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/src/components/CustomTree/src/collapseTreeStyle.scss b/src/components/CustomTree/src/collapseTreeStyle.scss index 8bc33e2..96246d2 100644 --- a/src/components/CustomTree/src/collapseTreeStyle.scss +++ b/src/components/CustomTree/src/collapseTreeStyle.scss @@ -62,18 +62,10 @@ display: inline-block; // margin-bottom: -10px; - width: 12px; - height: 12px; - margin-top: -2px; - - // position: absolute; - // left: -2px; + width: 16px; + height: 16px; + margin-top: -1px; margin-left: -2px; - - // border-radius: 50%; - // border-left: 1px solid red ; - // background-image: url("@/assets/svg/bgFooter.svg"); - background-image: url("@/assets/svg/icons/treeNodeLineSelected.svg"); background-repeat: no-repeat; diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index 1f2e49f..45e61cc 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -3,7 +3,7 @@ import Notice from "./notice/index.vue"; import mixNav from "./sidebar/mixNav.vue"; import { useNav } from "@/layout/hooks/useNav"; -// import Breadcrumb from "./sidebar/breadCrumb.vue"; +import Breadcrumb from "./sidebar/breadCrumb.vue"; import topCollapse from "./sidebar/topCollapse.vue"; import { useTranslationLang } from "../hooks/useTranslationLang"; import globalization from "@/assets/svg/globalization.svg?component"; @@ -39,10 +39,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang(); @toggleClick="toggleSideBar" /> - + diff --git a/src/layout/components/sidebar/breadCrumb.vue b/src/layout/components/sidebar/breadCrumb.vue index ef29bd1..ea6e60b 100644 --- a/src/layout/components/sidebar/breadCrumb.vue +++ b/src/layout/components/sidebar/breadCrumb.vue @@ -4,7 +4,7 @@ import { transformI18n } from "@/plugins/i18n"; import { ref, watch, onMounted, toRaw } from "vue"; import { getParentPaths, findRouteByPath } from "@/router/utils"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; -import { useRoute, useRouter, RouteLocationMatched } from "vue-router"; +import { useRoute, useRouter } from "vue-router"; const route = useRoute(); const levelList = ref([]); @@ -64,14 +64,14 @@ const getBreadcrumb = (): void => { ); }; -const handleLink = (item: RouteLocationMatched): void => { - const { redirect, path } = item; - if (redirect) { - router.push(redirect as any); - } else { - router.push(path); - } -}; +// const handleLink = (item: RouteLocationMatched): void => { +// const { redirect, path } = item; +// if (redirect) { +// router.push(redirect as any); +// } else { +// router.push(path); +// } +// }; onMounted(() => { getBreadcrumb(); @@ -96,9 +96,7 @@ watch( v-for="item in levelList" :key="item.path" > - - {{ transformI18n(item.meta.title) }} - + {{ transformI18n(item.meta.title) }} diff --git a/src/views/serverModule/components/ServerCard.scss b/src/views/serverModule/components/ServerCard.scss new file mode 100644 index 0000000..21b29b6 --- /dev/null +++ b/src/views/serverModule/components/ServerCard.scss @@ -0,0 +1,70 @@ +@import "@/style/index"; + +.server-card { + box-sizing: border-box; + height: 182px; + + // background-color: skyblue; + // border: 1.5px solid #52c41a + border-radius: 12px; + box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%); + + &_offline { + background-color: #f5f5f5; + + // border: 1.5px solid #dcdcdc; + } + + .server-header { + position: relative; + display: flex; + align-items: center; + justify-content: flex-start; + width: 100%; + height: 54px; + padding: 16px; + border-bottom: 1px solid #e0e0e0; + + .server-state { + position: absolute; + top: 0; + right: 0; + width: 48px; + height: 24px; + font-size: 14px; + color: #fff; + text-align: center; + background-color: #52c41a; + border-radius: 0 12px; + + &_offline { + background-color: #dcdcdc; + } + } + } + + .server-content { + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + height: 128px; + padding: 16px; + + .server-content-left { + width: 80px; + } + + .server-content-right { + flex: 1; + padding-left: 12px; + } + } + + .rectProgress_box { + padding: 4px 0; + font-size: 12px; + color: $--web-font1; + } +} diff --git a/src/views/serverModule/components/ServerCard.vue b/src/views/serverModule/components/ServerCard.vue index ba077a0..913e19f 100644 --- a/src/views/serverModule/components/ServerCard.vue +++ b/src/views/serverModule/components/ServerCard.vue @@ -1,5 +1,5 @@ - &_offline { - background-color: #dcdcdc; - } - } +