+
@@ -61,6 +65,8 @@ import { useRoute, useRouter } from "vue-router";
import {usePermissionStore} from "@/store/modules/permission"
import { useSettingStore } from "@/store/modules/setting";
import SubItem from '../components/SubMenu/SubItem.vue'
+import Footer from '../components/Footer/index.vue'
+import SubMenu from '../components/SubMenu/SubMenu.vue'
import TagsView from '../components/TagsView/index.vue'
const PermissionStore = usePermissionStore()
const SettingStore = useSettingStore()
@@ -102,34 +108,40 @@ watch(()=>[route],()=>{
subMenus.value = []
}
basePath.value = firstMenu.path
- console.log('======触发========触发======',subMenus.value)
},{
deep: true,
immediate:true
})
-
const handleChangeMenu = (item)=>{
- if (item.children?.length) {
- subMenus.value = item.children
- }else {
- subMenus.value = [];
- }
router.push(item.path);
-
}
-
-console.log('permission_routes',menusRoutes.value,)
-
diff --git a/src/layout/components/SubMenu/SubItem.vue b/src/layout/components/SubMenu/SubItem.vue
index 9b9ccab..2d58929 100644
--- a/src/layout/components/SubMenu/SubItem.vue
+++ b/src/layout/components/SubMenu/SubItem.vue
@@ -2,26 +2,26 @@
-
-
-
-
-
-
+
+
+
+
+ {{ onlyOneChild.meta && onlyOneChild.meta.title }}
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.meta && item.meta.title }}
+
+
+
@@ -61,7 +61,6 @@ const hasOneShowingChild = (children = [], parent) => {
// 如果没有要显示的子路由器,则显示父路由器
if (showingChildren.length === 0) {
onlyOneChild.value = { ...parent, path: '', noShowingChildren: true }
- // onlyOneChild.value = { ...parent, noShowingChildren: true }
return true
}
@@ -75,8 +74,6 @@ const resolvePath = (routePath) => {
if (isExternal(props.basePath)) {
return props.basePath
}
- let path2 = path.resolve(props.basePath, routePath)
- console.log('======path======',props.basePath)
- return path2
+ return path.resolve(props.basePath, routePath)
}
diff --git a/src/layout/components/SubMenu/SubMenu.vue b/src/layout/components/SubMenu/SubMenu.vue
index 2c41665..2214d6b 100644
--- a/src/layout/components/SubMenu/SubMenu.vue
+++ b/src/layout/components/SubMenu/SubMenu.vue
@@ -7,9 +7,9 @@
{{ subItem.meta.title }}
-
+
-
+
@@ -22,12 +22,23 @@
diff --git a/src/layout/index.vue b/src/layout/index.vue
index afd891e..c8bab8e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,10 +1,9 @@
+
+
+
-
-
-
-
-
+
+
+
+
diff --git a/src/routers/modules/chat.ts b/src/routers/modules/chat.ts
index 3ea3fe2..de179fa 100644
--- a/src/routers/modules/chat.ts
+++ b/src/routers/modules/chat.ts
@@ -5,7 +5,7 @@ import Layout from "@/layout/index.vue";
const chartsRouter = [{
path: '/chat',
component: Layout,
- redirect: '/charts/index',
+ redirect: '/chat/index',
name: 'chat',
meta: {
title: '聊天框',
diff --git a/src/routers/modules/externalLink.ts b/src/routers/modules/externalLink.ts
index b1d305e..11eb065 100644
--- a/src/routers/modules/externalLink.ts
+++ b/src/routers/modules/externalLink.ts
@@ -5,7 +5,7 @@ import Layout from "@/layout/index.vue";
const externalLink = [{
path: '/external-link',
component: Layout,
- redirect: 'noRedirect',
+ redirect: '/external-link/wechat',
name: 'external-link',
meta: {
title: '外部链接',
diff --git a/src/routers/modules/nested.ts b/src/routers/modules/nested.ts
index d558da2..a455c1b 100644
--- a/src/routers/modules/nested.ts
+++ b/src/routers/modules/nested.ts
@@ -7,7 +7,7 @@ import Layout from "@/layout/index.vue";
const nestedRouter = [{
path: '/nested',
component: Layout,
- redirect: '/form/menu1',
+ redirect: '/nested/menu1',
name: 'nested',
meta: {
title: '路由嵌套',
@@ -20,6 +20,7 @@ const nestedRouter = [{
name: 'menu1',
meta: { title: '菜单1', icon: 'MenuIcon' },
alwaysShow:true,
+ redirect: '/nested/menu1/menu1-1',
children: [
{
path: 'menu1-1',
diff --git a/src/routers/modules/system.ts b/src/routers/modules/system.ts
index 05c21e8..a632540 100644
--- a/src/routers/modules/system.ts
+++ b/src/routers/modules/system.ts
@@ -5,7 +5,7 @@ import Layout from '@/layout/index.vue'
const systemRouter = [{
path: '/system',
component: Layout,
- redirect: '/system/page',
+ redirect: '/system/user',
name: 'system',
meta: {
title: '系统管理',
diff --git a/src/store/modules/setting.ts b/src/store/modules/setting.ts
index aaecd5d..2aad1be 100644
--- a/src/store/modules/setting.ts
+++ b/src/store/modules/setting.ts
@@ -19,7 +19,7 @@ export const useSettingStore = defineStore({
// 显示设置
showSetting:false,
// 菜单展示模式 默认 vertical horizontal / vertical /columns
- mode: 'columns',
+ mode: 'vertical',
// tagsView 是否展示 默认展示
showTag:true,
// 页脚