From d45812bf3b9cd06a6b4b3409063134507809e8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98chen=2Ehome=E2=80=99?= <1147347984@qq.com> Date: Tue, 16 Aug 2022 00:36:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/module/user.ts | 6 ++--- src/router/guard/dynamic.ts | 22 +++++++++++++++++-- src/router/guard/permission.ts | 4 ++-- src/router/index.ts | 3 ++- src/router/routes/index.ts | 12 +++++----- src/store/modules/auth.ts | 4 +++- src/store/modules/route.ts | 13 +++++++++-- src/views/dashboard/monitor/index.vue | 7 ++++++ src/views/dashboard/workbench/index.vue | 7 ++++++ .../not-found/index.vue | 0 .../not-permission/index.vue | 0 .../service-error/index.vue | 0 12 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 src/views/dashboard/monitor/index.vue create mode 100644 src/views/dashboard/workbench/index.vue rename src/views/{inherit-page => error}/not-found/index.vue (100%) rename src/views/{inherit-page => error}/not-permission/index.vue (100%) rename src/views/{inherit-page => error}/service-error/index.vue (100%) diff --git a/mock/module/user.ts b/mock/module/user.ts index 150fb23..f59d610 100644 --- a/mock/module/user.ts +++ b/mock/module/user.ts @@ -24,10 +24,10 @@ const userInfo = { }, children: [ { - name: 'dashboard_console', - path: '/dashboard/console', + name: 'dashboard_workbench', + path: '/dashboard/workbench', meta: { - title: '主控台', + title: '工作台', requiresAuth: true, icon: 'icon-park-outline:alarm', }, diff --git a/src/router/guard/dynamic.ts b/src/router/guard/dynamic.ts index bc9fa88..5b09a97 100644 --- a/src/router/guard/dynamic.ts +++ b/src/router/guard/dynamic.ts @@ -1,7 +1,6 @@ import { RouteRecordRaw } from 'vue-router'; import { router } from '@/router'; import { BasicLayout } from '@/layouts/index'; -import { constantRoutes } from '../routes'; export async function setDynamicRoutes() { const vueRoutes: RouteRecordRaw[] = [ @@ -41,7 +40,26 @@ export async function setDynamicRoutes() { requiresAuth: true, }, }, - ...constantRoutes, + { + path: '/dashboard/workbench', + name: 'workbench', + component: () => import('@/views/dashboard/workbench/index.vue'), + meta: { + title: '工作台', + icon: 'icon-park-outline:music-list', + requiresAuth: true, + }, + }, + { + path: '/dashboard/monitor', + name: 'monitor', + component: () => import('@/views/dashboard/monitor/index.vue'), + meta: { + title: '控制页', + icon: 'icon-park-outline:music-list', + requiresAuth: true, + }, + }, ], }, ]; diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts index 96b0158..c9ed21e 100644 --- a/src/router/guard/permission.ts +++ b/src/router/guard/permission.ts @@ -24,9 +24,9 @@ export async function createPermissionGuard( } return false; } - + // debugger; // 有登录但是没有路由，初始化路由、侧边菜单等 - await setDynamicRoutes(); + // await setDynamicRoutes(); await routeStore.initAuthRoute(); // 动态路由加载完回到根路由 next({ name: 'root' }); diff --git a/src/router/index.ts b/src/router/index.ts index 8125200..9637e42 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -2,6 +2,7 @@ import type { App } from 'vue'; import { createRouter, createWebHistory, createWebHashHistory, RouteRecordRaw } from 'vue-router'; import { setupRouterGuard } from './guard'; import { BasicLayout } from '@/layouts/index'; +import { constantRoutes } from './routes'; const routes: RouteRecordRaw[] = [ { @@ -9,7 +10,7 @@ const routes: RouteRecordRaw[] = [ name: 'root', redirect: '/test/test1', component: BasicLayout, - children: [], + children: [...constantRoutes], }, { path: '/login', diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index ac79b6b..30404d4 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -1,28 +1,30 @@ -// import { BasicLayout } from '@/layouts/index'; - +/* 页面中的一些固定路由，错误页等 */ export const constantRoutes = [ { path: '/no-found', name: 'not-found', - component: () => import('@/views/inherit-page/not-found/index.vue'), + component: () => import('@/views/error/not-found/index.vue'), meta: { title: '找不到页面', + icon: 'icon-park-outline:ghost', }, }, { path: '/no-permission', name: 'no-permission', - component: () => import('@/views/inherit-page/not-permission/index.vue'), + component: () => import('@/views/error/not-permission/index.vue'), meta: { title: '无权限', + icon: 'icon-park-outline:error', }, }, { path: '/service-error', name: 'service-error', - component: () => import('@/views/inherit-page/service-error/index.vue'), + component: () => import('@/views/error/service-error/index.vue'), meta: { title: '服务器错误', + icon: 'icon-park-outline:close-wifi', }, }, { diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts index 4a0d747..2e5219d 100644 --- a/src/store/modules/auth.ts +++ b/src/store/modules/auth.ts @@ -25,9 +25,11 @@ export const useAuthStore = defineStore('auth-store', { resetAuthStore() { const route = unref(router.currentRoute); const { toLogin } = useAppRouter(false); + const { resetRouteStore } = useRouteStore(); // 清除本地缓存 clearAuthStorage(); - // 清空pinia + // 清空路由、菜单等数据 + resetRouteStore(); this.$reset(); if (route.meta.requiresAuth) { toLogin(); diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 81b8106..7da8ed9 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -1,7 +1,8 @@ import { defineStore } from 'pinia'; import { renderIcon, getUserInfo } from '@/utils'; import { MenuOption, radioGroupProps } from 'naive-ui'; -// import { setDynamicRoutes } from '@/router/guard/dynamic'; +import { setDynamicRoutes } from '@/router/guard/dynamic'; +import { router } from '@/router'; interface RoutesStatus { isInitAuthRoute: boolean; @@ -17,6 +18,14 @@ export const useRouteStore = defineStore('route-store', { }; }, actions: { + resetRouteStore() { + this.resetRoutes(); + this.$reset(); + }, + resetRoutes() { + /* 删除后面添加的路由 */ + router.removeRoute('test'); + }, async setUserRoutes() { this.userRoutes = getUserInfo().userRoutes; }, @@ -61,7 +70,7 @@ export const useRouteStore = defineStore('route-store', { async initAuthRoute() { await this.setMenus(); - // await setDynamicRoutes(); + await setDynamicRoutes(); this.isInitAuthRoute = true; }, }, diff --git a/src/views/dashboard/monitor/index.vue b/src/views/dashboard/monitor/index.vue new file mode 100644 index 0000000..a3f9495 --- /dev/null +++ b/src/views/dashboard/monitor/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/dashboard/workbench/index.vue b/src/views/dashboard/workbench/index.vue new file mode 100644 index 0000000..18f68bd --- /dev/null +++ b/src/views/dashboard/workbench/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/inherit-page/not-found/index.vue b/src/views/error/not-found/index.vue similarity index 100% rename from src/views/inherit-page/not-found/index.vue rename to src/views/error/not-found/index.vue diff --git a/src/views/inherit-page/not-permission/index.vue b/src/views/error/not-permission/index.vue similarity index 100% rename from src/views/inherit-page/not-permission/index.vue rename to src/views/error/not-permission/index.vue diff --git a/src/views/inherit-page/service-error/index.vue b/src/views/error/service-error/index.vue similarity index 100% rename from src/views/inherit-page/service-error/index.vue rename to src/views/error/service-error/index.vue