|
@@ -93,13 +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=>{
|
|
@@ -111,11 +112,7 @@
|
|
|
let alarms=[],alarmItm=null
|
|
|
resp.data.forEach(alarmObj=>{
|
|
|
for(let code in alarmObj){
|
|
|
- alarmItm=JSON.parse(alarmObj[code])
|
|
|
- if(alarmValidCheck(alarmItm)){
|
|
|
- alarms.push(alarmItm)
|
|
|
- }
|
|
|
-
|
|
|
+ alarms.push(JSON.parse(alarmObj[code]))
|
|
|
}
|
|
|
})
|
|
|
alarmList.value=alarms
|