jingyuanchao
							
						 | 
						
							
							
								3ca03b1dc3
							
							bug修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								5021b4ed7b
							
							同步上下班规则修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								194439e29b
							
							Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								5fbbc54936
							
							上下班规则同步修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								cc2183cec4
							
							Merge remote-tracking branch 'origin/V0.1.1_alarm' into V0.1.1_alarm
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								ebe19447f7
							
							上下班规则同步修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								2079b5d34d
							
							bug修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								ba5355bce2
							
							告警规则代码修改,增加页面显示机构名称与主机名称
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								f223af2fbe
							
							Merge remote-tracking branch 'origin/V0.1.1_alarm' into V0.1.1_alarm
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								bd2ed68895
							
							告警规则代码修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								72fda3d87c
							
							告警中心下拉框查询,选中告警类型优化
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								f843bce9a2
							
							告警中心web功能下拉框查询优化
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								a9b9c5c1b6
							
							告警中心web页面下拉框查询条件sql优化
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								2748e783ba
							
							告警中心web功能优化
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								a99ed71872
							
							产品类型新增
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								caba8a8d78
							
							Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								086b15cb6f
							
							代码bug修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   gaoxiong
							
						 | 
						
							
							
								addb92602c
							
							添加websocket
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   gaoxiong
							
						 | 
						
							
							
								1a8f3d35cd
							
							添加websocket
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								1fdc433fc8
							
							报警主机传感器告警数据,告警描述优化
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								bdaafe3f7d
							
							上下班表结构sql提交
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								c591fdd709
							
							Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								bd70b9fe3f
							
							报警主机传感器相关功能代码修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								7405e6d159
							
							物联设备信息模块,设备类型下拉框查询列表接口修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								6890f5d32d
							
							物联设备信息模块,接入报警主机传感器数据功能
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   xujie
							
						 | 
						
							
							
								5b99e8a0d6
							
							上下班规则同步修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								8f64efa735
							
							Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   jingyuanchao
							
						 | 
						
							
							
								0fa0205906
							
							报警主机传感器相关功能代码修改
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								0018e4ce87
							
							告警规则功能,屏蔽空调和报警主机传感器 设备类型
						 | 
						1 gadu atpakaļ | 
					
				
					
						
							
								   humingshi-7@163.com
							
						 | 
						
							
							
								85553d3fa8
							
							报警主机传感器sql字典脚本bug修复
						 | 
						1 gadu atpakaļ |