| 
						
					 | 
					
						
						
							
						
						db7d4745dd
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-29 16:55:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b99175574
					 | 
					
						
						
							
							update again
						
						
						
						
						
						
					 | 
					
						2024-03-29 16:30:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee828ec4a7
					 | 
					
						
						
							
							're_infra'
						
						
						
						
						
						
					 | 
					
						2024-03-28 18:40:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6924566ab0
					 | 
					
						
						
							
							样式
						
						
						
						
						
						
					 | 
					
						2024-03-28 17:04:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c301215d1
					 | 
					
						
						
							
							purge
						
						
						
						
						
						
					 | 
					
						2024-03-27 16:34:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0fac4556d
					 | 
					
						
						
							
							update tableheight
						
						
						
						
						
						
					 | 
					
						2024-03-27 16:28:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						99fd016703
					 | 
					
						
						
							
							bug 3
						
						
						
						
						
						
					 | 
					
						2024-03-22 10:27:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ca1ef5624
					 | 
					
						
						
							
							update maintain
						
						
						
						
						
						
					 | 
					
						2024-02-20 14:38:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9561dc27e3
					 | 
					
						
						
							
							fix some bugs
						
						
						
						
						
						
					 | 
					
						2023-12-20 10:26:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ac17b15e1
					 | 
					
						
						
							
							update merge
						
						
						
						
						
						
					 | 
					
						2023-12-19 09:07:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f280a92145
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-12-19 09:01:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						3aec5ee86c
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-12-14 14:03:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						79274aa8c8
					 | 
					
						
						
							
							定制化报表,基础核心
						
						
						
						
						
						
					 | 
					
						2023-12-14 14:01:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						fbe8e5c023
					 | 
					
						
						
							
							新增报表
						
						
						
						
						
						
					 | 
					
						2023-12-13 16:50:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea21f3d4bc
					 | 
					
						
						
							
							add 安全设备,特种设备
						
						
						
						
						
						
					 | 
					
						2023-12-12 16:27:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						4e48eae2a7
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2023-12-04 14:14:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						8e7e31f918
					 | 
					
						
						
							
							Merge branch 'projects/mes-dy' into projects/mesxc-dy
						
						
						
						
						
						
					 | 
					
						2023-11-30 15:53:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						1d3372ed69
					 | 
					
						
						
							
							ui
						
						
						
						
						
						
					 | 
					
						2023-11-30 15:04:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be430ebbff
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
						
						
						
						
						
						
					 | 
					
						2023-11-30 09:08:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						fa5a303c08
					 | 
					
						
						
							
							bug ui
						
						
						
						
						
						
					 | 
					
						2023-11-29 16:53:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6b9d75f16
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
						
						
						
						
						
						
					 | 
					
						2023-11-28 09:03:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a18929a261
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-lb
						
						
						
						
						
						
					 | 
					
						2023-11-27 17:04:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2fdee9cafd
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-27 15:39:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76c2f50bf3
					 | 
					
						
						
							
							fix bugs
						
						
						
						
						
						
					 | 
					
						2023-11-27 11:31:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						b0efd66a75
					 | 
					
						
						
							
							bug ui
						
						
						
						
						
						
					 | 
					
						2023-11-27 09:38:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9f3434712
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
						
						
						
						
						
						
					 | 
					
						2023-11-27 09:31:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab09a2b08c
					 | 
					
						
						
							
							update zentao bugs
						
						
						
						
						
						
					 | 
					
						2023-11-22 17:04:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c736992a34
					 | 
					
						
						
							
							'1'
						
						
						
						
						
						
					 | 
					
						2023-11-22 14:49:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b348a31b24
					 | 
					
						
						
							
							update some equipment  bugs
						
						
						
						
						
						
					 | 
					
						2023-11-22 10:14:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67612c79df
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-14 15:47:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26862423c1
					 | 
					
						
						
							
							首页
						
						
						
						
						
						
					 | 
					
						2023-11-14 10:35:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						624ed7bc27
					 | 
					
						
						
							
							设备管理
						
						
						
						
						
						
					 | 
					
						2023-11-11 20:49:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57a4ca96e7
					 | 
					
						
						
							
							add
						
						
						
						
						
						
					 | 
					
						2023-10-31 17:49:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bacf2eab0b
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:35:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						216aa6291d
					 | 
					
						
						
							
							update 设备管理-基础配置-设备分组绑定
						
						
						
						
						
						
					 | 
					
						2023-10-27 14:24:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6006ae13d9
					 | 
					
						
						
							
							update flow
						
						
						
						
						
						
					 | 
					
						2023-10-24 11:17:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						106d0ed89c
					 | 
					
						
						
							
							merge server
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15da20fac7
					 | 
					
						
						
							
							add 添加一个缓存方案
						
						
						
						
						
						
					 | 
					
						2023-10-20 14:22:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f8baaa8955
					 | 
					
						
						
							
							update ui
						
						
						
						
						
						
					 | 
					
						2023-10-17 17:02:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe7821cbd8
					 | 
					
						
						
							
							update 核心模块-厂务-设备
						
						
						
						
						
						
					 | 
					
						2023-10-17 15:22:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						32cbf9076f
					 | 
					
						
						
							
							update 更新设备类型上传
						
						
						
						
						
						
					 | 
					
						2023-10-16 17:03:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f634d012c
					 | 
					
						
						
							
							bugfix zentao
						
						
						
						
						
						
					 | 
					
						2023-10-12 11:08:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2ee61b8cb
					 | 
					
						
						
							
							update 改为抽屉展示
						
						
						
						
						
						
					 | 
					
						2023-10-10 14:22:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						907db90e93
					 | 
					
						
						
							
							update 设备分组的抽屉
						
						
						
						
						
						
					 | 
					
						2023-10-09 16:27:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b23b5256f9
					 | 
					
						
						
							
							update 设备数据采集
						
						
						
						
						
						
					 | 
					
						2023-09-01 10:39:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0158a11644
					 | 
					
						
						
							
							update 设备分析-状态时序图
						
						
						
						
						
						
					 | 
					
						2023-08-31 16:58:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e37bb3f2ce
					 | 
					
						
						
							
							add 设备状态时序图组件
						
						
						
						
						
						
					 | 
					
						2023-08-29 14:47:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4ad325c02c
					 | 
					
						
						
							
							done 设备分组报警
						
						
						
						
						
						
					 | 
					
						2023-08-28 14:56:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9dc580ddd2
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-08-28 13:30:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						573192d27a
					 | 
					
						
						
							
							add 设备工段绑定,设备分组
						
						
						
						
						
						
					 | 
					
						2023-08-28 09:22:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |