| 
						
					 | 
					
						
						
							
						
						29dfb47b4b
					 | 
					
						
						
							
							Merge pull request 'lb' (#18) from lb into master
						
						
						
						
						
						
						
						Reviewed-on: #18 
						
						
					 | 
					
						2022-11-28 10:47:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e6a0ce257
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-28 09:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4cd6f748a9
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-28 09:45:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e10beb7a6
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-28 09:34:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3964f8541e
					 | 
					
						
						
							
							update 设备管理scrollbar
						
						
						
						
						
						
					 | 
					
						2022-11-28 09:15:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						86a5d3737c
					 | 
					
						
						
							
							Merge pull request 'lb' (#17) from lb into master
						
						
						
						
						
						
						
						Reviewed-on: #17 
						
						
					 | 
					
						2022-11-25 16:46:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8184ee8a6f
					 | 
					
						
						
							
							Merge branch 'master' into lb
						
						
						
						
						
						
					 | 
					
						2022-11-25 16:14:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70b47b1ec0
					 | 
					
						
						
							
							update 3d index
						
						
						
						
						
						
					 | 
					
						2022-11-25 16:12:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbe6cf41e4
					 | 
					
						
						
							
							update tooltip for all
						
						
						
						
						
						
					 | 
					
						2022-11-25 15:43:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff0bda0dba
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-25 15:10:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						582ac98a52
					 | 
					
						
						
							
							update 质量tooltip
						
						
						
						
						
						
					 | 
					
						2022-11-25 14:01:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f79481a35
					 | 
					
						
						
							
							update 质量,产线缺陷分析居中一点
						
						
						
						
						
						
					 | 
					
						2022-11-25 13:13:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c2aadc19a
					 | 
					
						
						
							
							update 各个tooltip样式
						
						
						
						
						
						
					 | 
					
						2022-11-25 11:59:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f96854fa29
					 | 
					
						
						
							
							update 质量tooltip样式
						
						
						
						
						
						
					 | 
					
						2022-11-25 11:09:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						569dd81dd7
					 | 
					
						
						
							
							Merge pull request 'zjl' (#16) from zjl into master
						
						
						
						
						
						
						
						Reviewed-on: #16 
						
						
					 | 
					
						2022-11-25 10:02:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8667da0332
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2022-11-25 10:01:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f06bb38e48
					 | 
					
						
						
							
							11.24修改
						
						
						
						
						
						
					 | 
					
						2022-11-25 09:59:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6aa7afb555
					 | 
					
						
						
							
							update 质量管理数据
						
						
						
						
						
						
					 | 
					
						2022-11-25 09:25:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b9dfa27ab
					 | 
					
						
						
							
							update data
						
						
						
						
						
						
					 | 
					
						2022-11-24 17:01:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f9f9f90bc
					 | 
					
						
						
							
							update 3d 报警提示
						
						
						
						
						
						
					 | 
					
						2022-11-24 16:46:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71e6f2eb85
					 | 
					
						
						
							
							update 3d 设备数据
						
						
						
						
						
						
					 | 
					
						2022-11-24 16:36:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						705da46633
					 | 
					
						
						
							
							update 3d,实时产量
						
						
						
						
						
						
					 | 
					
						2022-11-24 16:31:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c943481826
					 | 
					
						
						
							
							update 质量,产品成品率
						
						
						
						
						
						
					 | 
					
						2022-11-24 16:11:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df8ffa3676
					 | 
					
						
						
							
							update 3d 设备数据
						
						
						
						
						
						
					 | 
					
						2022-11-24 16:08:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e756b39e6c
					 | 
					
						
						
							
							update 生产监控实时数据
						
						
						
						
						
						
					 | 
					
						2022-11-24 15:33:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						123cdd59a5
					 | 
					
						
						
							
							update 班组交接班记录
						
						
						
						
						
						
					 | 
					
						2022-11-24 15:30:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be18358b9c
					 | 
					
						
						
							
							update 设备当前状态
						
						
						
						
						
						
					 | 
					
						2022-11-24 15:19:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eb525fce24
					 | 
					
						
						
							
							update 设备巡检管理
						
						
						
						
						
						
					 | 
					
						2022-11-24 15:17:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						899b9fa879
					 | 
					
						
						
							
							update 质量
						
						
						
						
						
						
					 | 
					
						2022-11-24 15:02:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e48b2103a
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-24 13:43:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3db6ac92fe
					 | 
					
						
						
							
							update 产线缺陷
						
						
						
						
						
						
					 | 
					
						2022-11-24 13:38:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f37dfbb328
					 | 
					
						
						
							
							update 产品成品率
						
						
						
						
						
						
					 | 
					
						2022-11-24 11:06:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						539235fcfb
					 | 
					
						
						
							
							update 3d 公用工程
						
						
						
						
						
						
					 | 
					
						2022-11-24 09:45:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						935943e33b
					 | 
					
						
						
							
							Merge pull request '11.23修改' (#15) from zjl into master
						
						
						
						
						
						
						
						Reviewed-on: #15 
						
						
					 | 
					
						2022-11-24 09:20:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f21ea0bc99
					 | 
					
						
						
							
							11.23修改
						
						
						
						
						
						
					 | 
					
						2022-11-24 09:20:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8592611b6
					 | 
					
						
						
							
							update 缺陷分析
						
						
						
						
						
						
					 | 
					
						2022-11-23 17:00:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9ac894a4a
					 | 
					
						
						
							
							update 产线成品
						
						
						
						
						
						
					 | 
					
						2022-11-23 16:57:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59b40fefe9
					 | 
					
						
						
							
							update 实时产量
						
						
						
						
						
						
					 | 
					
						2022-11-23 16:27:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						779a771bb5
					 | 
					
						
						
							
							update 公用工程消耗
						
						
						
						
						
						
					 | 
					
						2022-11-23 14:03:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97ee3a9a4c
					 | 
					
						
						
							
							update 3d 完成度颜色
						
						
						
						
						
						
					 | 
					
						2022-11-23 09:55:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa1461c298
					 | 
					
						
						
							
							Merge pull request 'lb' (#14) from lb into master
						
						
						
						
						
						
						
						Reviewed-on: #14 
						
						
					 | 
					
						2022-11-23 09:44:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34c8b29348
					 | 
					
						
						
							
							update 3d homepage
						
						
						
						
						
						
					 | 
					
						2022-11-23 09:43:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2819cf2efc
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-23 09:38:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa2d99d43f
					 | 
					
						
						
							
							update 公用工程消耗
						
						
						
						
						
						
					 | 
					
						2022-11-23 09:34:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22dc4ff1d7
					 | 
					
						
						
							
							update 实时产量和能耗
						
						
						
						
						
						
					 | 
					
						2022-11-23 09:29:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec3e364117
					 | 
					
						
						
							
							Merge branch 'master' into lb
						
						
						
						
						
						
					 | 
					
						2022-11-22 17:00:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7552e09aeb
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-11-22 16:58:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						890a1be63c
					 | 
					
						
						
							
							update 更新3d缺陷分类分析
						
						
						
						
						
						
					 | 
					
						2022-11-22 16:44:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfcfdd35ea
					 | 
					
						
						
							
							update 更新3d产线产品率
						
						
						
						
						
						
					 | 
					
						2022-11-22 16:31:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01cc292256
					 | 
					
						
						
							
							update 更新3d小框
						
						
						
						
						
						
					 | 
					
						2022-11-22 16:04:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |