diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 20bebfa..95ceb41 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -47,7 +47,7 @@ &.has-logo { .el-scrollbar { - height: calc(100% - 56px); + height: auto; } } @@ -62,7 +62,7 @@ } .svg-icon { - margin-right: 12px; + margin-right: 14px; } .el-menu { diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 03d675f..305dcdf 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -21,8 +21,8 @@ $menuLightText: #374151; $menuLightActiveText: #0052d9; // 基础变量 -$base-sidebar-width: 216px; -$sideBarWidth: 216px; +$base-sidebar-width: 248px; +$sideBarWidth: 248px; // 菜单暗色变量 $base-menu-color: #374151; diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index c13e5e9..5a9b904 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -85,14 +85,14 @@ getBreadcrumb() \ No newline at end of file + diff --git a/src/components/TableSearch/index.vue b/src/components/TableSearch/index.vue index 6bb4556..74e74ec 100644 --- a/src/components/TableSearch/index.vue +++ b/src/components/TableSearch/index.vue @@ -37,33 +37,75 @@ const resetQuery = () => { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 827d9ce..cc9b674 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,12 +1,31 @@