2 Commit-ok 99df4b99ff ... 2b120fc8a4

Szerző SHA1 Üzenet Dátum
  lxh 2b120fc8a4 Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 1 hónapja
  lxh cccaf5303d 安全监控-报警历史添加权限 1 hónapja

+ 1 - 0
src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -552,6 +552,7 @@ export const noWarningArr = [
   'bundleSpyDayReport',
   'gate_linkdlfm',
   'substation_normal',
+  'safetymonitor'
 ]; // 无预警详情的
 export const haveSysDetailArr = ['forcFan', 'pulping']; //有场景详情的
 

+ 4 - 1
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -588,7 +588,7 @@
               />
             </div>
           </a-tab-pane>
-          <a-tab-pane key="3" tab="报警历史" v-if="!noWarningArr.find((item) => deviceType.startsWith(item))">
+          <a-tab-pane key="3" tab="报警历史" v-if="!noWarningArr.find((item) => deviceType.startsWith(item)) || !hasPermission('safety:hideWarning')">
             <div class="tab-item">
               <AlarmHistoryTable
                 ref="alarmHistoryTable"
@@ -680,6 +680,7 @@
   import { useMethods } from '/@/hooks/system/useMethods';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGlobSetting } from '/@/hooks/setting';
+   import { usePermission } from '/@/hooks/web/usePermission';
 
   type DeviceType = { deviceType: string; deviceName: string; datalist: any[] };
   const glob = useGlobSetting();
@@ -693,6 +694,8 @@
       default: () => {},
     },
   });
+
+   const { hasPermission } = usePermission();
   const { handleExportXls } = useMethods();
   const go = useGo();
   const echatsOption = {