Merge branch 'ww' into 'main'

fix: global notify has exit don not have permiseion

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

@@ -8,7 +8,6 @@
 
 
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ConfigProvider } from 'ant-design-vue';
   import { ConfigProvider } from 'ant-design-vue';
-  import { useAlarmNotify } from './views/alarm/log/hook/useAlarmNotify';
   import { AppProvider } from '/@/components/Application';
   import { AppProvider } from '/@/components/Application';
   import { useTitle } from '/@/hooks/web/useTitle';
   import { useTitle } from '/@/hooks/web/useTitle';
   import { useLocale } from '/@/locales/useLocale';
   import { useLocale } from '/@/locales/useLocale';
@@ -16,5 +15,4 @@
   const { getAntdLocale } = useLocale();
   const { getAntdLocale } = useLocale();
 
 
   useTitle();
   useTitle();
-  useAlarmNotify();
 </script>
 </script>

@@ -29,6 +29,7 @@
   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',
@@ -57,7 +58,7 @@
         }
         }
         return cls;
         return cls;
       });
       });
-
+      useAlarmNotify();
       return {
       return {
         getShowFullHeaderRef,
         getShowFullHeaderRef,
         getShowSidebar,
         getShowSidebar,

@@ -4,6 +4,9 @@ import { notification, Button, Tag } from 'ant-design-vue';
 import { h, onMounted, onUnmounted } from 'vue';
 import { h, onMounted, onUnmounted } from 'vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { alarmLevel } from '/@/views/device/list/config/detail.config';
 import { alarmLevel } from '/@/views/device/list/config/detail.config';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { usePermission } from '/@/hooks/web/usePermission';
+import { useUserStore } from '/@/store/modules/user';
 
 
 interface UseAlarmNotifyParams {
 interface UseAlarmNotifyParams {
   alarmNotifyStatus?: AlarmStatus;
   alarmNotifyStatus?: AlarmStatus;
@@ -88,8 +91,22 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
     }, interval);
     }, interval);
   };
   };
 
 
+  const { hasPermission } = usePermission();
+
   onMounted(() => {
   onMounted(() => {
-    polling();
+    const alarmPermissionKey = 'api:alarm:global:notify';
+    const hasPermissionRole = [RoleEnum.CUSTOMER_USER, RoleEnum.TENANT_ADMIN];
+    const userInfo = useUserStore().getUserInfo;
+    const userRoles = userInfo.roles || [];
+
+    const getPermissionFlag = () => {
+      for (const item of userRoles) {
+        const flag = hasPermissionRole.find((each) => item === each);
+        if (flag) return true;
+      }
+      return false;
+    };
+    if (hasPermission(alarmPermissionKey) && getPermissionFlag()) polling();
   });
   });
 
 
   onUnmounted(() => {
   onUnmounted(() => {

@@ -5,8 +5,8 @@
   import { Tabs, Row, Col, Spin, Button, Pagination, Empty } from 'ant-design-vue';
   import { Tabs, Row, Col, Spin, Button, Pagination, Empty } from 'ant-design-vue';
   import { cameraPage } from '/@/api/camera/cameraManager';
   import { cameraPage } from '/@/api/camera/cameraManager';
   import { CameraRecord } from '/@/api/camera/model/cameraModel';
   import { CameraRecord } from '/@/api/camera/model/cameraModel';
-  import { videoPlay as VideoPlay } from 'vue3-video-play'; // 引入组件
-  import 'vue3-video-play/dist/style.css'; // 引入css
+  import { videoPlay as VideoPlay } from 'vue3-video-play';
+  import 'vue3-video-play/dist/style.css';
   import { useFullscreen } from '@vueuse/core';
   import { useFullscreen } from '@vueuse/core';
   import CameraDrawer from './CameraDrawer.vue';
   import CameraDrawer from './CameraDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';