helloDy
							
						 
					 | 
					
						
						
							
						
						e9538744c3
					 | 
					
						
						
							
							冲突
						
						
						
						
						
						
					 | 
					
						2023-09-15 14:38:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						8cf2f9f7e9
					 | 
					
						
						
							
							生产监控
						
						
						
						
						
						
					 | 
					
						2023-09-15 14:37:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						772a4b0633
					 | 
					
						
						
							
							bugfix zentao 1
						
						
						
						
						
						
					 | 
					
						2023-09-15 14:30:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27ebe39a96
					 | 
					
						
						
							
							update image
						
						
						
						
						
						
					 | 
					
						2023-09-13 17:06:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97f9b52e87
					 | 
					
						
						
							
							Merge pull request 'zhp' (#24) from zhp into test
						
						
						
						
						
						
						
						Reviewed-on: #24 
						
						
					 | 
					
						2023-09-13 16:02:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						f85cb9c50f
					 | 
					
						
						
							
							Merge branch 'test' into zhp
						
						
						
						
						
						
					 | 
					
						2023-09-13 16:01:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						e8cc1fc50b
					 | 
					
						
						
							
							生产分析
						
						
						
						
						
						
					 | 
					
						2023-09-13 16:00:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f08c79fc23
					 | 
					
						
						
							
							Merge pull request 'update router mode' (#23) from lb into test
						
						
						
						
						
						
						
						Reviewed-on: #23 
						
						
					 | 
					
						2023-09-13 12:28:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f341ec7b30
					 | 
					
						
						
							
							update router mode
						
						
						
						
						
						
					 | 
					
						2023-09-13 12:24:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c6a6b001c
					 | 
					
						
						
							
							Merge pull request 'lb' (#22) from lb into test
						
						
						
						
						
						
						
						Reviewed-on: #22 
						
						
					 | 
					
						2023-09-12 11:13:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b17bc0e162
					 | 
					
						
						
							
							update build:prod PUBLIC_PATH
						
						
						
						
						
						
					 | 
					
						2023-09-12 11:12:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d595bf2660
					 | 
					
						
						
							
							Merge branch 'test' into lb
						
						
						
						
						
						
					 | 
					
						2023-09-12 11:10:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						529889fd07
					 | 
					
						
						
							
							update 工段设备绑定 dialogForm
						
						
						
						
						
						
					 | 
					
						2023-09-12 11:09:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f18299b0b
					 | 
					
						
						
							
							add dialogForm of equipmentbind
						
						
						
						
						
						
					 | 
					
						2023-09-11 16:47:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1c93cbf46
					 | 
					
						
						
							
							Merge pull request 'zhp' (#21) from zhp into test
						
						
						
						
						
						
						
						Reviewed-on: #21 
						
						
					 | 
					
						2023-09-11 16:11:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						7d959e8ad3
					 | 
					
						
						
							
							Merge branch 'test' into zhp
						
						
						
						
						
						
					 | 
					
						2023-09-11 16:09:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6f0040a0ae
					 | 
					
						
						
							
							生产监控更新
						
						
						
						
						
						
					 | 
					
						2023-09-11 16:09:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						347265853e
					 | 
					
						
						
							
							Merge pull request 'dy' (#20) from dy into test
						
						
						
						
						
						
						
						Reviewed-on: #20 
						
						
					 | 
					
						2023-09-11 15:59:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						f1bbdf82e5
					 | 
					
						
						
							
							冲突
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:55:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						645ba2843f
					 | 
					
						
						
							
							生产监控
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:53:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2f3a9e850
					 | 
					
						
						
							
							update 设备全参数查询
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:24:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						14e06d9456
					 | 
					
						
						
							
							Merge pull request 'lb' (#19) from lb into test
						
						
						
						
						
						
						
						Reviewed-on: #19 
						
						
					 | 
					
						2023-09-11 15:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e05b3e3d6
					 | 
					
						
						
							
							merge from test
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:04:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e678f7c68
					 | 
					
						
						
							
							Merge branch 'equipment-module-dev' into lb
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:00:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b91b8c3d3c
					 | 
					
						
						
							
							update 设备加工数量
						
						
						
						
						
						
					 | 
					
						2023-09-11 14:57:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a445c8a61d
					 | 
					
						
						
							
							Merge pull request 'zjl' (#17) from zjl into test
						
						
						
						
						
						
						
						Reviewed-on: #17 
						
						
					 | 
					
						2023-09-08 16:02:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df0dc6bfa0
					 | 
					
						
						
							
							能源分析
						
						
						
						
						
						
					 | 
					
						2023-09-08 16:01:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c44ec6f49c
					 | 
					
						
						
							
							update 基本完成设备全参数查询
						
						
						
						
						
						
					 | 
					
						2023-09-08 15:57:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6197b606f1
					 | 
					
						
						
							
							update 设备全参数
						
						
						
						
						
						
					 | 
					
						2023-09-08 08:42:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c7b32ab34e
					 | 
					
						
						
							
							add 设备全参数测试数据
						
						
						
						
						
						
					 | 
					
						2023-09-07 11:24:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e2527f2e30
					 | 
					
						
						
							
							remove 设备效率分析的查看趋势功能
						
						
						
						
						
						
					 | 
					
						2023-09-06 16:38:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76100ad07d
					 | 
					
						
						
							
							update 设备全参数
						
						
						
						
						
						
					 | 
					
						2023-09-06 16:37:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa02c3933d
					 | 
					
						
						
							
							remove 产品质量监控可视化
						
						
						
						
						
						
					 | 
					
						2023-09-06 16:18:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d63d49ccc9
					 | 
					
						
						
							
							add pie chart
						
						
						
						
						
						
					 | 
					
						2023-09-06 15:18:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd437ed7d3
					 | 
					
						
						
							
							update 效率分析
						
						
						
						
						
						
					 | 
					
						2023-09-06 15:02:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						052f54833c
					 | 
					
						
						
							
							update 更新效率分析
						
						
						
						
						
						
					 | 
					
						2023-09-06 11:28:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e42b7035fe
					 | 
					
						
						
							
							update 完成时序图模块
						
						
						
						
						
						
					 | 
					
						2023-09-06 10:39:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a505f34abc
					 | 
					
						
						
							
							update 设备产量时序图
						
						
						
						
						
						
					 | 
					
						2023-09-06 09:56:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edc5d64acc
					 | 
					
						
						
							
							update 更新设备效率分析
						
						
						
						
						
						
					 | 
					
						2023-09-05 17:01:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5fed36234
					 | 
					
						
						
							
							update 设备产量时序图
						
						
						
						
						
						
					 | 
					
						2023-09-05 16:35:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2dd40261a4
					 | 
					
						
						
							
							update 设备状态时序图
						
						
						
						
						
						
					 | 
					
						2023-09-05 16:26:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e16b6f8ec4
					 | 
					
						
						
							
							update 设备状态时序图
						
						
						
						
						
						
					 | 
					
						2023-09-05 16:07:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c59a7e715
					 | 
					
						
						
							
							能源分析
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:45:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55e8de1136
					 | 
					
						
						
							
							update 完成设备异常分析
						
						
						
						
						
						
					 | 
					
						2023-09-04 15:24:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ffedc7c256
					 | 
					
						
						
							
							add 设备异常分析
						
						
						
						
						
						
					 | 
					
						2023-09-04 14:50:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbd78c6aa5
					 | 
					
						
						
							
							update 产品质量分析
						
						
						
						
						
						
					 | 
					
						2023-09-04 14:35:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f71b6a7c0
					 | 
					
						
						
							
							add 产品质量分析-图形弹窗
						
						
						
						
						
						
					 | 
					
						2023-09-04 13:54:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55f90a7102
					 | 
					
						
						
							
							add 设备模块剩余部分页面
						
						
						
						
						
						
					 | 
					
						2023-09-04 09:41:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b6df60a315
					 | 
					
						
						
							
							Merge branch 'equipment-module-dev' into lb
						
						
						
						
						
						
					 | 
					
						2023-09-01 17:05:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31dbc025c8
					 | 
					
						
						
							
							done 设备数采相关
						
						
						
						
						
						
					 | 
					
						2023-09-01 17:05:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |