|
@@ -93,6 +93,14 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ const alarmValidCheck=(alarmItm)=>{
|
|
|
+ if(!alarmItm.alarmTime){
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ let d=new Date(alarmItm.alarmTime.replace(/-/g,'/'))
|
|
|
+ return ((new Date()).getTime()-d.getTime()) < 300000
|
|
|
+ }
|
|
|
+
|
|
|
const loadAlarm=()=>{
|
|
|
noticeBarAPI.loadAlarms().then(resp=>{
|
|
|
//console.log(resp)
|
|
@@ -100,10 +108,14 @@
|
|
|
alarmList.value=[]
|
|
|
}
|
|
|
else{
|
|
|
- let alarms=[]
|
|
|
+ let alarms=[],alarmItm=null
|
|
|
resp.data.forEach(alarmObj=>{
|
|
|
for(let code in alarmObj){
|
|
|
- alarms.push(JSON.parse(alarmObj[code]))
|
|
|
+ alarmItm=JSON.parse(alarmObj[code])
|
|
|
+ if(alarmValidCheck(alarmItm)){
|
|
|
+ alarms.push(alarmItm)
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
})
|
|
|
alarmList.value=alarms
|