From 2c8b51f46387d46858353c49e2f83db31c7adc1f Mon Sep 17 00:00:00 2001 From: 1638245306 <1638245306@qq.com> Date: Wed, 25 Sep 2024 23:32:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E5=85=81=E8=AE=B8=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=9C=A8=E6=A1=86=E6=9E=B6=E5=A4=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu.py | 4 ++-- web/src/router/index.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index 28dce62..c0c6b65 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -120,11 +120,11 @@ class MenuViewSet(CustomModelViewSet): """用于前端获取当前角色的路由""" user = request.user if user.is_superuser: - queryset = self.queryset.filter(status=1) + queryset = self.queryset.filter(status=1).order_by("id") else: role_list = user.role.values_list('id', flat=True) menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id', flat=True) - queryset = Menu.objects.filter(id__in=menu_list) + queryset = Menu.objects.filter(id__in=menu_list).order_by("id") serializer = WebRouterSerializer(queryset, many=True, request=request) data = serializer.data return SuccessResponse(data=data, total=len(data), msg="获取成功") diff --git a/web/src/router/index.ts b/web/src/router/index.ts index 3f564eb..dbb3073 100644 --- a/web/src/router/index.ts +++ b/web/src/router/index.ts @@ -93,6 +93,8 @@ export function formatTwoStageRoutes(arr: any) { return newArr; } +const frameOutRoutes = staticRoutes.map(item => item.path) + // 路由加载前 router.beforeEach(async (to, from, next) => { NProgress.configure({showSpinner: false}); @@ -109,8 +111,9 @@ router.beforeEach(async (to, from, next) => { } else if (token && to.path === '/login') { next('/home'); NProgress.done(); + }else if(token && frameOutRoutes.includes(to.path) ){ + next() } else { - const storesRoutesList = useRoutesList(pinia); const {routesList} = storeToRefs(storesRoutesList); if (routesList.value.length === 0) {