Merge remote-tracking branch 'origin/main'

修改报警规则

src/utils/alarmReminder.js

@@ -3,7 +3,7 @@ import { listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo';
 const websocketUrl = 'ws://119.45.202.115:7164/ws';
 // const websocketUrl = 'ws://119.45.202.115:7181/ws';
 const deviceDataTime = {};
-const overtime = 1000 * 60 * 10;
+const overtime = 1000 * 60 * 60;
 const intervalTime = 1000 * 30;
 let alarmReminderSocket = null;
 let overtimeTimer = null;