From 8ce35ee72e52f51f93e61d2dec6084c3cfd397b6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 十二月 2024 15:31:36 +0800
Subject: [PATCH] 设备查询完善
---
src/permission.ts | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index a4ea69d..d0bfdfd 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -6,8 +6,10 @@
import { useNProgress } from '@/hooks/web/useNProgress'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import { useDictStoreWithOut } from '@/store/modules/dict'
+import { useCheckTypeStoreWithOut } from '@/store/modules/checkType'
import { useUserStoreWithOut } from '@/store/modules/user'
import { usePermissionStoreWithOut } from '@/store/modules/permission'
+import { useRoomStoreWithOut } from "@/store/modules/room";
const { start, done } = useNProgress()
@@ -82,9 +84,14 @@
// 鑾峰彇鎵�鏈夊瓧鍏�
const dictStore = useDictStoreWithOut()
const userStore = useUserStoreWithOut()
+ const roomStore = useRoomStoreWithOut()
+ const checkTypeStore = useCheckTypeStoreWithOut()
const permissionStore = usePermissionStoreWithOut()
if (!dictStore.getIsSetDict) {
await dictStore.setDictMap()
+ }
+ if (!checkTypeStore.getIsSetCheckType) {
+ await checkTypeStore.setCheckTypeMap()
}
if (userStore.getIsSetUser ) {
@@ -92,7 +99,7 @@
// <<<銆愯瘖瀹ら�夋嫨銆�<<<
if ( to.path !== '/roomselect' &&
userStore.getRoles.includes("doctor") && !userStore.getRoles.includes("super_admin")
- && !userStore.getIsSetRoom ) {
+ && !roomStore.getIsSetRoom ) {
next({path: `/roomselect?redirect=${to.fullPath}`})
return
}
@@ -114,7 +121,7 @@
// <<<銆愯瘖瀹ら�夋嫨銆�<<<
if ( to.path !== '/roomselect' &&
userStore.getRoles.includes("doctor") && !userStore.getRoles.includes("super_admin")
- && !userStore.getIsSetRoom ) {
+ && !roomStore.getIsSetRoom ) {
next({path: `/roomselect?redirect=${to.fullPath}`})
return
}
--
Gitblit v1.9.3