| 
						
					 | 
					
						
						
							
						
						9382cb4cf5
					 | 
					
						
						
							
							Merge branch 'features/warning' into zjl
						
						
						
						
						
						
					 | 
					
						2024-09-18 11:10:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2325dc0373
					 | 
					
						
						
							
							Merge pull request '修改' (#11) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #11 
						
						
					 | 
					
						2024-09-18 10:59:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						196ad512af
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-18 10:55:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa03a0b329
					 | 
					
						
						
							
							Merge branch 'features/warning' into zjl
						
						
						
						
						
						
					 | 
					
						2024-09-18 09:57:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29f8e96a2a
					 | 
					
						
						
							
							Merge pull request 'zhp' (#10) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #10 
						
						
					 | 
					
						2024-09-18 09:55:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						aa86600a1a
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-18 09:13:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						379de8fda0
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-18 09:12:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa5cae9a78
					 | 
					
						
						
							
							Merge branch 'features/warning' into zjl
						
						
						
						
						
						
					 | 
					
						2024-09-18 08:32:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						50aada1223
					 | 
					
						
						
							
							装软件
						
						
						
						
						
						
					 | 
					
						2024-09-18 08:30:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						248fafdf2c
					 | 
					
						
						
							
							Merge pull request 'zhp' (#9) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #9 
						
						
					 | 
					
						2024-09-15 13:14:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						9589fba7c2
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-14 17:10:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						0739f8cf00
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-14 17:09:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e1f95bd009
					 | 
					
						
						
							
							Merge pull request 'zhp' (#8) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #8 
						
						
					 | 
					
						2024-09-14 13:21:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6de0fe4753
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-14 13:19:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						a8b5e57f38
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-14 13:18:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4985a5379
					 | 
					
						
						
							
							Merge pull request 'zhp' (#7) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #7 
						
						
					 | 
					
						2024-09-13 16:58:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						f9dde6e159
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-13 16:53:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						b27d70f0fc
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-13 16:52:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd34efc0b4
					 | 
					
						
						
							
							Merge pull request 'zhp' (#6) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #6 
						
						
					 | 
					
						2024-09-13 15:52:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						2d2d6d4c15
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-13 15:49:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						696d852cd2
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-09-13 15:47:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						637f387f02
					 | 
					
						
						
							
							Merge pull request 'zhp' (#5) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #5 
						
						
					 | 
					
						2024-09-02 13:21:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6a25d4e30d
					 | 
					
						
						
							
							Merge branch 'features/warning' into zhp
						
						
						
						
						
						
					 | 
					
						2024-09-02 09:56:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						270ca5dce7
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-09-02 09:55:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fcb1549ee3
					 | 
					
						
						
							
							Merge pull request 'zhp' (#4) from zhp into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #4 
						
						
					 | 
					
						2024-08-30 19:10:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						e4e9ba11c3
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-08-30 17:32:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						f702e950ac
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-08-30 17:17:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7cc3deeee
					 | 
					
						
						
							
							Merge pull request '溶液速度视频' (#3) from zjl into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #3 
						
						
					 | 
					
						2024-07-22 15:29:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c635243357
					 | 
					
						
						
							
							溶液速度视频
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:26:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e64a4d0e2
					 | 
					
						
						
							
							Merge pull request '窑炉优化' (#2) from zjl into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #2 
						
						
					 | 
					
						2024-07-19 16:33:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a15105a9b0
					 | 
					
						
						
							
							窑炉优化
						
						
						
						
						
						
					 | 
					
						2024-07-19 16:31:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bace9fa501
					 | 
					
						
						
							
							Merge pull request 'zjl' (#1) from zjl into features/warning
						
						
						
						
						
						
						
						Reviewed-on: #1 
						
						
					 | 
					
						2024-07-12 15:11:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c6cd097433
					 | 
					
						
						
							
							1优化
						
						
						
						
						
						
					 | 
					
						2024-07-12 14:52:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d7af62305
					 | 
					
						
						
							
							窑炉优化
						
						
						
						
						
						
					 | 
					
						2024-07-12 14:12:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						214e9fe892
					 | 
					
						
						
							
							底&顶ok
						
						
						
						
						
						
					 | 
					
						2024-07-10 15:39:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9968280724
					 | 
					
						
						
							
							7.9
						
						
						
						
						
						
					 | 
					
						2024-07-09 14:50:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						8b4322996e
					 | 
					
						
						
							
							update 注释
						
						
						
						
						
						
					 | 
					
						2024-04-29 13:28:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						b325c3fc05
					 | 
					
						
						
							
							update 报警大小
						
						
						
						
						
						
					 | 
					
						2024-04-28 13:55:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						28c9c1906e
					 | 
					
						
						
							
							update 烟气处理
						
						
						
						
						
						
					 | 
					
						2024-04-25 11:04:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						7ddae1b3a4
					 | 
					
						
						
							
							update videos
						
						
						
						
						
						
					 | 
					
						2024-04-25 10:01:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						61477cdd30
					 | 
					
						
						
							
							Merge branch 'features/warning' of http://git.picaiba.com/mt-fe-group/xuchang-new into features/warning
						
						
						
						
						
						
					 | 
					
						2024-04-25 09:44:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						6e5badf01a
					 | 
					
						
						
							
							add video
						
						
						
						
						
						
					 | 
					
						2024-04-25 09:44:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						311cdfc5f7
					 | 
					
						
						
							
							1'
						
						
						
						
						
						
					 | 
					
						2024-04-24 17:02:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						bc8b68e449
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-04-24 16:58:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						024f4bcf14
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-04-23 15:27:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						361aedd4ad
					 | 
					
						
						
							
							done alarm
						
						
						
						
						
						
					 | 
					
						2024-04-23 15:26:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						60c6fdda79
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-04-23 11:24:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						15708c0eef
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-04-23 09:33:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						2996c061dc
					 | 
					
						
						
							
							merge bugfix
						
						
						
						
						
						
					 | 
					
						2024-04-22 16:58:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lb
							
						 
					 | 
					
						
						
							
						
						9894aeca50
					 | 
					
						
						
							
							update WarnAlert
						
						
						
						
						
						
					 | 
					
						2024-04-19 17:03:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |