| 
						
					 | 
					
						
						
							
						
						aeb43c8d41
					 | 
					
						
						
							
							Merge branch 'master' of git.picaiba.com:g7hoo/chenzhou
						
						
						
						
						
						
					 | 
					
						2024-03-19 15:58:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5652cff730
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-19 15:57:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Melete
							
						 
					 | 
					
						
						
							
						
						f66b3a8a7a
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-03-18 19:58:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						476b936660
					 | 
					
						
						
							
							conflict
						
						
						
						
						
						
					 | 
					
						2024-03-18 17:16:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						59c652c3cf
					 | 
					
						
						
							
							add 导航 & update chart样式 & update 横坐标倾斜
						
						
						
						
						
						
					 | 
					
						2024-03-18 17:14:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						bb7f77e3ac
					 | 
					
						
						
							
							add 导航 & update chart样式
						
						
						
						
						
						
					 | 
					
						2024-03-18 17:13:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e306b0f837
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-16 10:12:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						85cc0c4c43
					 | 
					
						
						
							
							update alert list 3d info
						
						
						
						
						
						
					 | 
					
						2024-03-15 16:08:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						cfcdf4eb0a
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-15 14:49:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						bb44001961
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-03-14 17:06:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						f9fc8e8c66
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-13 16:08:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						d56efd1c2f
					 | 
					
						
						
							
							update main-screen glass
						
						
						
						
						
						
					 | 
					
						2024-03-11 09:43:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						6d57597aa1
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-03-08 17:09:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						149e801d6d
					 | 
					
						
						
							
							add 波片移动
						
						
						
						
						
						
					 | 
					
						2024-03-08 16:31:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						c6f5bc7d80
					 | 
					
						
						
							
							add glass
						
						
						
						
						
						
					 | 
					
						2024-03-08 10:17:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						822732742d
					 | 
					
						
						
							
							update alert list screen
						
						
						
						
						
						
					 | 
					
						2024-03-06 10:14:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						9c3b9218d2
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-05 17:00:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						52a9111a19
					 | 
					
						
						
							
							update websocket and store
						
						
						
						
						
						
					 | 
					
						2024-03-05 16:42:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						8ff6fd02df
					 | 
					
						
						
							
							update main-screen
						
						
						
						
						
						
					 | 
					
						2024-03-05 14:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						1b33520b61
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-05 10:58:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						335f61c0a1
					 | 
					
						
						
							
							update charts
						
						
						
						
						
						
					 | 
					
						2024-03-05 10:24:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						fb4c1500e7
					 | 
					
						
						
							
							update bg
						
						
						
						
						
						
					 | 
					
						2024-02-29 15:23:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						8d30507f1b
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-02-28 17:02:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae7adebae0
					 | 
					
						
						
							
							Merge branch 'master' of git.picaiba.com:g7hoo/chenzhou
						
						
						
						
						
						
					 | 
					
						2024-02-28 16:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae3c430d38
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-02-28 16:51:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						23bf4790df
					 | 
					
						
						
							
							add 2 extra pages
						
						
						
						
						
						
					 | 
					
						2024-02-28 16:07:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						544e42ac83
					 | 
					
						
						
							
							bugfix
						
						
						
						
						
						
					 | 
					
						2024-02-28 15:14:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4001ed86e
					 | 
					
						
						
							
							Merge branch 'master' of git.picaiba.com:g7hoo/chenzhou
						
						
						
						
						
						
					 | 
					
						2024-02-27 16:00:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						ca35a1768d
					 | 
					
						
						
							
							update init settings
						
						
						
						
						
						
					 | 
					
						2024-02-27 15:59:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9cdd255947
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-02-27 15:52:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						1c4ce804ff
					 | 
					
						
						
							
							done 本月班组情况
						
						
						
						
						
						
					 | 
					
						2024-01-31 11:22:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						da305dbba9
					 | 
					
						
						
							
							done 本日班组情况
						
						
						
						
						
						
					 | 
					
						2024-01-31 11:16:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						62d3566f29
					 | 
					
						
						
							
							done 本月生产线情况
						
						
						
						
						
						
					 | 
					
						2024-01-31 11:04:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						7eab7ddebb
					 | 
					
						
						
							
							done 本日生产线情况
						
						
						
						
						
						
					 | 
					
						2024-01-31 10:49:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						e0da16c903
					 | 
					
						
						
							
							done latest week
						
						
						
						
						
						
					 | 
					
						2024-01-31 10:20:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						53ead47882
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-30 17:00:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						31f427789f
					 | 
					
						
						
							
							update 3d--本月班组情况
						
						
						
						
						
						
					 | 
					
						2024-01-30 15:39:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						2a6cb3fe87
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2024-01-30 14:23:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						22f4b99ab1
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-30 14:09:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						2276c1f9dd
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-29 17:03:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						85e82a1913
					 | 
					
						
						
							
							modify
						
						
						
						
						
						
					 | 
					
						2024-01-29 14:14:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						23cb871c93
					 | 
					
						
						
							
							adjust file structures
						
						
						
						
						
						
					 | 
					
						2024-01-29 09:21:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						7c84ba4595
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-26 17:15:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						c314f4b78e
					 | 
					
						
						
							
							update datapage
						
						
						
						
						
						
					 | 
					
						2024-01-26 16:48:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						086be4da66
					 | 
					
						
						
							
							fix lunbo
						
						
						
						
						
						
					 | 
					
						2024-01-26 16:38:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						259752291c
					 | 
					
						
						
							
							fix fullscreen
						
						
						
						
						
						
					 | 
					
						2024-01-26 16:35:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						b6b17d1ef0
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-26 16:01:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						9b3779555c
					 | 
					
						
						
							
							update 3d
						
						
						
						
						
						
					 | 
					
						2024-01-26 14:41:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						e25dfe8f02
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-23 16:49:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DESKTOP-FUDKNA8\znjsz
							
						 
					 | 
					
						
						
							
						
						98dd4428af
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-01-23 16:32:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |