Merge branch 'all-v4-liufei' into 'all-v4'

将权限码常量改为枚举类型

See merge request skyeye/skyeye_frontend/skyeye-admin!306

src/store/modules/user.ts

@@ -3,13 +3,14 @@ import { createStorage } from '@/utils/Storage';
 import { store } from '@/store';
 import { ACCESS_TOKEN, CURRENT_USER, IS_LOCKSCREEN, TENANT_TOKEN } from '@/store/mutation-types';
 import { ResultEnum } from '@/enums/httpEnum';
-
-const Storage = createStorage({ storage: localStorage });
 import { getUserInfo, login } from '@/api/system/user';
 import { storage } from '@/utils/Storage';
 import { useGlobSetting } from '@/hooks/setting';
+import { PERM } from '@/types/permission/type';
 
+const Storage = createStorage({ storage: localStorage });
 const { tenantCode } = useGlobSetting();
+
 export interface IUserState {
   token: string;
   // username: string;
@@ -148,7 +149,7 @@ export const useUserStore = defineStore({
      * @param permission
      * @returns
      */
-    checkPermission(permission: string) {
+    checkPermission(permission: PERM) {
       return this.permissions.find((x) => x.code === permission);
     },
   },

src/types/permission/constants.ts

@@ -1,109 +1,109 @@
 /**
  * 设备管理模块
  */
-export const PERM_DEVICE = {
+export enum PERM_DEVICE {
   /**
    * 相机管理
    */
-  CAMERA_VIEW: 'device_admin_module:camera_view', // 相机查看
-  CAMERA_ADD: 'device_admin_module:camera_add', // 相机添加
-  CAMERA_EDIT: 'device_admin_module:camera_edit', // 相机编辑
-  CAMERA_DELETE: 'device_admin_module:camera_delete', // 相机删除
+  CAMERA_VIEW = 'device_admin_module:camera_view', // 相机查看
+  CAMERA_ADD = 'device_admin_module:camera_add', // 相机添加
+  CAMERA_EDIT = 'device_admin_module:camera_edit', // 相机编辑
+  CAMERA_DELETE = 'device_admin_module:camera_delete', // 相机删除
 
   /**
    * NVR管理
    */
-  NVR_VIEW: 'device_admin_module:nvr_view', // NVR设备查看
-  NVR_ADD: 'device_admin_module:nvr_add', // NVR设备添加
-  NVR_EDIT: 'device_admin_module:nvr_edit', // NVR设备编辑
-  NVR_DELETE: 'device_admin_module:nvr_delete', // NVR设备删除
-} as const;
+  NVR_VIEW = 'device_admin_module:nvr_view', // NVR设备查看
+  NVR_ADD = 'device_admin_module:nvr_add', // NVR设备添加
+  NVR_EDIT = 'device_admin_module:nvr_edit', // NVR设备编辑
+  NVR_DELETE = 'device_admin_module:nvr_delete', // NVR设备删除
+}
 
 
 /**
  * 算法管理模块
  */
-export const PERM_ALGO = {
+export enum PERM_ALGO {
   /**
    * 算法配置
    */
-  CONFIG_ADD: 'algo_admin_module:config_add', // 算法添加
-  CONFIG_DELETE: 'algo_admin_module:config_delete', // 算法删除
-  CONFIG_PARAM: 'algo_admin_module:config_param', // 算法参数配置
-} as const;
+  CONFIG_ADD = 'algo_admin_module:config_add', // 算法添加
+  CONFIG_DELETE = 'algo_admin_module:config_delete', // 算法删除
+  CONFIG_PARAM = 'algo_admin_module:config_param', // 算法参数配置
+}
 
 /**
  * 数据管理模块
  */
-export const PERM_DATA= {
+export enum PERM_DATA {
   /**
    * 违规数据 - 检测数据数据管理
    */
-  VIOLATION_DELETE: 'data_admin_module:violation_delete', // 数据删除
-  VIOLATION_VIDEO_SETTING: 'data_admin_module:violation_video_settings', // 自定义报警视频时长
-  VIOLATION_PERVIEW: 'data_admin_module:violation_preview', // 预审模式
+  VIOLATION_DELETE = 'data_admin_module:violation_delete', // 数据删除
+  VIOLATION_VIDEO_SETTING = 'data_admin_module:violation_video_settings', // 自定义报警视频时长
+  VIOLATION_PERVIEW = 'data_admin_module:violation_preview', // 预审模式
 
   /**
    * 违规数据 - 展示数据管理
    */
-  VIOLATION_FAKE_ADD: 'data_admin_module:violation_fake_add', // 添加数据
-  VIOLATION_FAKE_DELETE: 'data_admin_module:violation_fake_delete', // 删除数据
-} as const;
+  VIOLATION_FAKE_ADD = 'data_admin_module:violation_fake_add', // 添加数据
+  VIOLATION_FAKE_DELETE = 'data_admin_module:violation_fake_delete', // 删除数据
+}
 
 /**
  * 消息管理模块
  */
-export const PERM_NOTICE = {
+export enum PERM_NOTICE {
   /**
    * 报表消息
    */
-  REPORT_ADD: 'notice_admin_module:report_add', 
-  REPORT_EDIT: 'notice_admin_module:report_edit',
-  REPORT_DELETE: 'notice_admin_module:report_delete',
-  REPORT_ENABLE: 'notice_admin_module:report_enable',
+  REPORT_ADD = 'notice_admin_module:report_add', 
+  REPORT_EDIT = 'notice_admin_module:report_edit',
+  REPORT_DELETE = 'notice_admin_module:report_delete',
+  REPORT_ENABLE = 'notice_admin_module:report_enable',
 
   /**
    * 报警消息
    */
-  ALARM_ADD: 'notice_admin_module:alarm_add',
-  ALARM_EDIT: 'notice_admin_module:alarm_edit',
-  ALARM_DELETE: 'notice_admin_module:alarm_delete',
-  ALARM_ENABLE: 'notice_admin_module:alarm_enable',
+  ALARM_ADD = 'notice_admin_module:alarm_add',
+  ALARM_EDIT = 'notice_admin_module:alarm_edit',
+  ALARM_DELETE = 'notice_admin_module:alarm_delete',
+  ALARM_ENABLE = 'notice_admin_module:alarm_enable',
 
   /**
    * 人员分组
    */
-  PERSONNEL_ADD: 'notice_admin_module:personnel_add',
-  PERSONNEL_EDIT: 'notice_admin_module:personnel_edit',
-  PERSONNEL_DELETE: 'notice_admin_module:personnel_delete',
-} as const;
+  PERSONNEL_ADD = 'notice_admin_module:personnel_add',
+  PERSONNEL_EDIT = 'notice_admin_module:personnel_edit',
+  PERSONNEL_DELETE = 'notice_admin_module:personnel_delete',
+}
 
 /**
  * 用户管理模块
  */
-export const PERM_USER = {
+export enum PERM_USER {
   /**
    * 组织管理
    */
-  DEPT_VIEW: 'user_admin_module:dept_view',
-  DEPT_ADD: 'user_admin_module:dept_add',
-  DEPT_EDIT: 'user_admin_module:dept_edit',
-  DEPT_DELETE: 'user_admin_module:dept_delete',
+  DEPT_VIEW = 'user_admin_module:dept_view',
+  DEPT_ADD = 'user_admin_module:dept_add',
+  DEPT_EDIT = 'user_admin_module:dept_edit',
+  DEPT_DELETE = 'user_admin_module:dept_delete',
 
   /**
    * 角色管理
    */
-  ROLE_VIEW: 'user_admin_module:role_view',
-  ROLE_ADD: 'user_admin_module:role_add',
-  ROLE_EDIT: 'user_admin_module:role_edit',
-  ROLE_DELETE: 'user_admin_module:role_delete',
+  ROLE_VIEW = 'user_admin_module:role_view',
+  ROLE_ADD = 'user_admin_module:role_add',
+  ROLE_EDIT = 'user_admin_module:role_edit',
+  ROLE_DELETE = 'user_admin_module:role_delete',
 
   /**
    * 账号管理
    */
-  ACCOUNT_VIEW: 'user_admin_module:account_view',
-  ACCOUNT_ADD: 'user_admin_module:account_add',
-  ACCOUNT_EDIT: 'user_admin_module:account_edit',
-  ACCOUNT_DELETE: 'user_admin_module:account_delete',
-  ACCOUNT_RESET_PASSWORD: 'user_admin_module:account_password',
-} as const;
+  ACCOUNT_VIEW = 'user_admin_module:account_view',
+  ACCOUNT_ADD = 'user_admin_module:account_add',
+  ACCOUNT_EDIT = 'user_admin_module:account_edit',
+  ACCOUNT_DELETE = 'user_admin_module:account_delete',
+  ACCOUNT_RESET_PASSWORD = 'user_admin_module:account_password',
+}

src/types/permission/type.ts

@@ -1,3 +1,5 @@
+import{ PERM_DATA, PERM_ALGO, PERM_NOTICE, PERM_USER, PERM_DEVICE} from './constants';
+
 /**
  * 权限项 详细信息
  */
@@ -44,3 +46,5 @@ export interface PermissionViewItem {
 export type PermissionView = PermissionViewItem & { children?: PermissionViewItem[] | null };
 export type PermissionViewTree = PermissionView[];
 
+
+export type PERM = PERM_DEVICE | PERM_ALGO | PERM_DATA | PERM_NOTICE | PERM_USER;