bill 1 سال پیش
والد
کامیت
ebc45d73fe
5فایلهای تغییر یافته به همراه17 افزوده شده و 7 حذف شده
  1. 3 3
      src/directive/permission.ts
  2. 0 1
      src/store/permission.ts
  3. 8 3
      src/store/role.ts
  4. 4 0
      src/store/system.ts
  5. 2 0
      src/view/case/help.ts

+ 3 - 3
src/directive/permission.ts

@@ -16,9 +16,9 @@ export const operateIsPermissionByScene = (scene: Scene) => {
 
 // 查看某个操作是否有权限
 export const operateIsPermissionByPath = (...operate: string[]) => {
-  // if (import.meta.env.DEV) {
-  //   return true;
-  // }
+  if (import.meta.env.DEV) {
+    return true;
+  }
   const routeName = router.currentRoute.value.name as string;
   const currentRoleName = `${routeName}:${operate.join(":")}`;
   return permission.value.find((item) => item.resourceKey === currentRoleName);

+ 0 - 1
src/store/permission.ts

@@ -29,6 +29,5 @@ export const getPermissionRoutes = (routeNames: string[]) => {
 };
 
 export const setPermission = (perms: UserPermission[]) => {
-  console.log(perms);
   permission.value = perms.concat(pubPermissions);
 };

+ 8 - 3
src/store/role.ts

@@ -7,6 +7,7 @@ import {
   getPageList,
   getRoleTree,
   removeRole,
+  userperInfo,
 } from "@/request";
 import { changSaveLocal, getLocal } from "@/util/localUtil";
 import { ref } from "vue";
@@ -88,7 +89,9 @@ export const delRole = async (roleId: string) =>
   axios.post(removeRole + roleId, { id: roleId });
 
 // 服务端permission转客户端
-const serviceCoverUserPermission = (roles: RoleMenuTreeItem[]): UserPermission[] =>
+const serviceCoverUserPermission = (
+  roles: RoleMenuTreeItem[]
+): UserPermission[] =>
   roles.map((s) => ({
     resourceKey: s.perms,
     type: s.type,
@@ -121,8 +124,10 @@ const userPermListCover = (perms: string[]): UserPermission[] => {
 
 // 刷新权限
 export const refreshRole = async () => {
-  roleLevel.value = user.value.info.isAdmin ? RoleLevel.systemAdmin : RoleLevel.corps;
-  setPermission(userPermListCover(user.value.info.permsList));
+  roleLevel.value = user.value.info.isAdmin
+    ? RoleLevel.systemAdmin
+    : RoleLevel.corps;
+  setPermission(userPermListCover((await axios.get(userperInfo)).data));
 
   // const { perm, level } = await getRole(roleId.value);
   // setPermission(serviceCoverUserPermission(perm as any));

+ 4 - 0
src/store/system.ts

@@ -29,6 +29,10 @@ export const login = async (props: LoginProps) => {
   await refreshRole();
 };
 
+if (user.value.token) {
+  await refreshRole();
+}
+
 export const uploadFile = async (file: File) => {
   return (await axios.post<string>(uploadFileUrl, { file })).data;
 };

+ 2 - 0
src/view/case/help.ts

@@ -61,6 +61,7 @@ export const getSWKKSyncLink = async (caseId: number) => {
     SceneTypeDomain[SceneType.SWKK]
   );
   const roomId = await getSyncSceneInfo(caseId);
+
   const params = {
     vruserId: user.value.info.userName,
     platform: "fd",
@@ -68,6 +69,7 @@ export const getSWKKSyncLink = async (caseId: number) => {
     fromMiniApp: "0",
     role: "leader",
     avatar: user.value.info.avatar,
+    redirect: escape(location.href),
     name: user.value.info.userName,
     isTour: "0",
     m: kkScenes[0].num,