Merge branch 'ww' into 'main'

fix: global alarm notify can not notify

See merge request huang/yun-teng-iot-front!354

@@ -29,7 +29,6 @@
   import { useLockPage } from '/@/hooks/web/useLockPage';
   import { useLockPage } from '/@/hooks/web/useLockPage';
 
 
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useAppInject } from '/@/hooks/web/useAppInject';
-  import { useAlarmNotify } from '/@/views/alarm/log/hook/useAlarmNotify';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DefaultLayout',
     name: 'DefaultLayout',
@@ -58,7 +57,6 @@
         }
         }
         return cls;
         return cls;
       });
       });
-      useAlarmNotify();
       return {
       return {
         getShowFullHeaderRef,
         getShowFullHeaderRef,
         getShowSidebar,
         getShowSidebar,

@@ -33,6 +33,7 @@
   import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
   import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
   import { getTransitionName } from './transition';
   import { getTransitionName } from './transition';
   import { useMultipleTabStore } from '/@/store/modules/multipleTab';
   import { useMultipleTabStore } from '/@/store/modules/multipleTab';
+  import { useAlarmNotify } from '/@/views/alarm/log/hook/useAlarmNotify';
   export default defineComponent({
   export default defineComponent({
     name: 'PageLayout',
     name: 'PageLayout',
     components: { FrameLayout },
     components: { FrameLayout },
@@ -53,6 +54,8 @@
         return tabStore.getCachedTabList;
         return tabStore.getCachedTabList;
       });
       });
 
 
+      useAlarmNotify();
+
       return {
       return {
         getTransitionName,
         getTransitionName,
         openCache,
         openCache,

@@ -15,6 +15,10 @@ interface UseAlarmNotifyParams {
   duration?: number;
   duration?: number;
 }
 }
 
 
+export enum AlarmPermissionKey {
+  GLOBAL_NOTIFY = 'api:alarm:global:notify',
+}
+
 export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
   const {
   const {
     alarmNotifyStatus = AlarmStatus.ACTIVE_UN_ACK,
     alarmNotifyStatus = AlarmStatus.ACTIVE_UN_ACK,
@@ -94,24 +98,23 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
   const { hasPermission } = usePermission();
   const { hasPermission } = usePermission();
 
 
   onMounted(() => {
   onMounted(() => {
-    const alarmPermissionKey = 'api:alarm:global:notify';
     const hasPermissionRole = [RoleEnum.CUSTOMER_USER, RoleEnum.TENANT_ADMIN];
     const hasPermissionRole = [RoleEnum.CUSTOMER_USER, RoleEnum.TENANT_ADMIN];
     const userInfo = useUserStore().getUserInfo;
     const userInfo = useUserStore().getUserInfo;
     const userRoles = userInfo.roles || [];
     const userRoles = userInfo.roles || [];
 
 
-    const getPermissionFlag = () => {
+    const getRoleHasNotifyFlag = () => {
       for (const item of userRoles) {
       for (const item of userRoles) {
         const flag = hasPermissionRole.find((each) => item === each);
         const flag = hasPermissionRole.find((each) => item === each);
         if (flag) return true;
         if (flag) return true;
       }
       }
       return false;
       return false;
     };
     };
-    if (hasPermission(alarmPermissionKey) && getPermissionFlag()) polling();
+
+    if (hasPermission(AlarmPermissionKey.GLOBAL_NOTIFY) && getRoleHasNotifyFlag()) polling();
   });
   });
 
 
   onUnmounted(() => {
   onUnmounted(() => {
     clearInterval(timeout as NodeJS.Timer);
     clearInterval(timeout as NodeJS.Timer);
     timeout = null;
     timeout = null;
-    // currentNotifyId = null;
   });
   });
 }
 }