| 
						
						
						
					 | 
				
				 | 
				
					@ -1,7 +1,7 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					const moment = require('moment') | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					// let isDev = false
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					let isDev = true | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					let isDev = false | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					// let isDev = true
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					let proDebug = false | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					proDebug = true | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -9,8 +9,8 @@ proDebug = true | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					module.exports = function (app, opts) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					   const alarmsPush = app.fs.scheduleInit( | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         // interval: '12 */1 * * * *',
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         interval: '12 0 0 0 */1 *', | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         interval: '12 */1 * * * *', | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         // interval: '12 0 0 0 */1 *',
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         immediate: isDev, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					         proRun: !isDev, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      }, | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -1227,16 +1227,12 @@ module.exports = function (app, opts) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                    if (x.factor && x.factor.length) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                       x.factor.map((f, fi) => { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                          let showOne2 = (fi == 0) ? true : false | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                          if (f.devices && f.devices.length) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                             f.devices.map((c, ci) => { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                                let showOne3 = (ci == 0) ? true : false | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                                if (c.alarmDatas && c.alarmDatas.length) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                                   c.alarmDatas.map(a => { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                                      let tableData = '<tr>' | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                                                      for (let t of alarmTitleArr) { | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |