diff --git a/desktop/frontend/src/components/AsideMenu.vue b/desktop/frontend/src/components/AsideMenu.vue
index bbbafc1..9736dae 100644
--- a/desktop/frontend/src/components/AsideMenu.vue
+++ b/desktop/frontend/src/components/AsideMenu.vue
@@ -115,12 +115,23 @@ watch(() => router.currentRoute.value.path, (newValue, oldValue) => {
function activeMenu() {
const currRoute = router.currentRoute
const path = currRoute.value.path
- // console.log("currRoute path:", path)
+ console.log("currRoute path:", path)
let index = getIndexByPath(path)
- // console.log("index:", index)
+ console.log("index:", index)
if (utils.notNull(index)) {
return index
}
+ // 没有匹配上,截取掉path最后一级,再匹配一次
+ const lastIndex = path.lastIndexOf('/')
+ if (lastIndex != -1) {
+ const newPath = path.substring(0, lastIndex)
+ console.log("截取后newPath:", newPath)
+ index = getIndexByPath(newPath)
+ console.log("截取后index:", index)
+ if (utils.notNull(index)) {
+ return index
+ }
+ }
return "1"
}
diff --git a/desktop/frontend/src/components/MainFrame.vue b/desktop/frontend/src/components/MainFrame.vue
index 4334ebc..83b2473 100644
--- a/desktop/frontend/src/components/MainFrame.vue
+++ b/desktop/frontend/src/components/MainFrame.vue
@@ -143,7 +143,7 @@ header {
width: 100%;
height: 44px;
padding: 0px;
- background-color: var(--el-bg-color);
+ background-color: var(--el-fg-color);
display: flex;
justify-content: center;
align-items: center;
@@ -169,6 +169,7 @@ main {
width: 100%;
padding: 0px;
overflow: hidden;
+ background-color: var(--el-bg-color);
}
.menu-logo {
diff --git a/desktop/frontend/src/components/TopHeader.vue b/desktop/frontend/src/components/TopHeader.vue
index ec6cc4e..83d2ab5 100644
--- a/desktop/frontend/src/components/TopHeader.vue
+++ b/desktop/frontend/src/components/TopHeader.vue
@@ -27,31 +27,42 @@
-
-