| 
						
					 | 
					
						
						
							
						
						37c0c445a3
					 | 
					
						
						
							
							Merge pull request 'lb' (#6) from lb into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #6 
						
						
					 | 
					
						2022-09-29 09:38:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72f9793edf
					 | 
					
						
						
							
							update 设备自动code
						
						
						
						
						
						
					 | 
					
						2022-09-29 09:31:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b7002fe17a
					 | 
					
						
						
							
							Merge branch 'develop' into lb
						
						
						
						
						
						
					 | 
					
						2022-09-28 17:00:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b670dc0ac
					 | 
					
						
						
							
							update 设备分组报警
						
						
						
						
						
						
					 | 
					
						2022-09-28 14:24:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3907f5161e
					 | 
					
						
						
							
							update 查询逻辑“
						
						
						
						
						
						
					 | 
					
						2022-09-28 11:23:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d493b34a5f
					 | 
					
						
						
							
							update table 索引“
						
						
						
						
						
						
					 | 
					
						2022-09-28 10:58:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						747247aed6
					 | 
					
						
						
							
							bug fix
						
						
						
						
						
						
					 | 
					
						2022-09-27 16:52:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1caf68592a
					 | 
					
						
						
							
							update dialog
						
						
						
						
						
						
					 | 
					
						2022-09-27 15:59:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d32750d87
					 | 
					
						
						
							
							update 实时数据“
						
						
						
						
						
						
					 | 
					
						2022-09-27 15:52:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0253cc235
					 | 
					
						
						
							
							add 设备历史参数
						
						
						
						
						
						
					 | 
					
						2022-09-27 15:32:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13df2016b9
					 | 
					
						
						
							
							update 实时数据刷新
						
						
						
						
						
						
					 | 
					
						2022-09-27 11:05:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						749e503f75
					 | 
					
						
						
							
							Merge pull request 'lb' (#4) from lb into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #4 
						
						
					 | 
					
						2022-09-26 17:03:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1554562933
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-09-26 17:01:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea1c7de4ca
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-09-26 16:10:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b0f724da2
					 | 
					
						
						
							
							update 报表几处国际化
						
						
						
						
						
						
					 | 
					
						2022-09-26 14:19:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f33d0c9048
					 | 
					
						
						
							
							Merge pull request 'lb' (#3) from lb into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #3 
						
						
					 | 
					
						2022-09-23 15:16:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c9ce641fa
					 | 
					
						
						
							
							Merge branch 'develop' into lb
						
						
						
						
						
						
					 | 
					
						2022-09-23 15:11:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31834662c9
					 | 
					
						
						
							
							update icon
						
						
						
						
						
						
					 | 
					
						2022-09-23 15:02:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f39481693
					 | 
					
						
						
							
							update 基本完成设备状态时序图
						
						
						
						
						
						
					 | 
					
						2022-09-22 15:02:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a45aead7c
					 | 
					
						
						
							
							update 基本完成设备状态时序图的展示
						
						
						
						
						
						
					 | 
					
						2022-09-22 14:20:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31f496cc13
					 | 
					
						
						
							
							update 设备状态时序图产线工段关联
						
						
						
						
						
						
					 | 
					
						2022-09-22 13:25:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						399589bb3b
					 | 
					
						
						
							
							update 设备状态时序图
						
						
						
						
						
						
					 | 
					
						2022-09-22 11:28:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ad64efe59
					 | 
					
						
						
							
							update 设备异常分析
						
						
						
						
						
						
					 | 
					
						2022-09-22 10:03:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b21d91c8da
					 | 
					
						
						
							
							Merge pull request 'build: :新增自动构建发布脚本' (#2) from cicd into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #2 
						
						
					 | 
					
						2022-09-21 17:13:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a95a7a20d3
					 | 
					
						
						
							
							build: :新增自动构建发布脚本
						
						
						
						
						
						
					 | 
					
						2022-09-21 17:10:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ed4a512bc
					 | 
					
						
						
							
							update 数据分析-设备效率分析的echarts
						
						
						
						
						
						
					 | 
					
						2022-09-21 16:58:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9187d56f6c
					 | 
					
						
						
							
							add 设备效率分析的图表
						
						
						
						
						
						
					 | 
					
						2022-09-21 15:30:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41cd01ecb0
					 | 
					
						
						
							
							update 设备状态时序图页面
						
						
						
						
						
						
					 | 
					
						2022-09-21 13:25:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f590d09671
					 | 
					
						
						
							
							update 设备异常分析的顶部头和表格头
						
						
						
						
						
						
					 | 
					
						2022-09-21 11:09:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5158d9a315
					 | 
					
						
						
							
							update 设备效率分析接口联调
						
						
						
						
						
						
					 | 
					
						2022-09-21 10:59:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cc5aa4d72f
					 | 
					
						
						
							
							update 设备效率表格头信息
						
						
						
						
						
						
					 | 
					
						2022-09-21 10:34:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a03d1db029
					 | 
					
						
						
							
							update 设备效率分析头部
						
						
						
						
						
						
					 | 
					
						2022-09-21 10:15:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3999e4e589
					 | 
					
						
						
							
							init 数据分析“
						
						
						
						
						
						
					 | 
					
						2022-09-20 15:59:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0fef0454d
					 | 
					
						
						
							
							Merge pull request 'lb' (#1) from lb into develop
						
						
						
						
						
						
						
						Reviewed-on: #1 
						
						
					 | 
					
						2022-09-20 14:53:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e532989ddf
					 | 
					
						
						
							
							update vuecli proxy
						
						
						
						
						
						
					 | 
					
						2022-09-19 16:30:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10e454eb2a
					 | 
					
						
						
							
							update 设备参数状态监控,将‘参数近期值’导向“获取设备的历史参数值”(暂未实现)
						
						
						
						
						
						
					 | 
					
						2022-09-08 15:47:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce9c0f9d76
					 | 
					
						
						
							
							update 设备参数状态监控
						
						
						
						
						
						
					 | 
					
						2022-09-08 14:50:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2423905fd
					 | 
					
						
						
							
							add 设备当前状态页面
						
						
						
						
						
						
					 | 
					
						2022-09-08 10:46:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						04dc0bcc49
					 | 
					
						
						
							
							update base-table add tooltip
						
						
						
						
						
						
					 | 
					
						2022-09-08 08:48:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1006ef0d6a
					 | 
					
						
						
							
							init cell container
						
						
						
						
						
						
					 | 
					
						2022-09-07 15:10:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9ff6226b3
					 | 
					
						
						
							
							update 产品新增-加工时间提示文字;实时数据的报错方式修改
						
						
						
						
						
						
					 | 
					
						2022-09-07 15:08:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						08aa78fdb1
					 | 
					
						
						
							
							update 更新upload组件样式,更新列表的index
						
						
						
						
						
						
					 | 
					
						2022-09-07 15:04:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d557c8196
					 | 
					
						
						
							
							update 菜单国际化
						
						
						
						
						
						
					 | 
					
						2022-09-05 12:21:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e020c1e174
					 | 
					
						
						
							
							'强制变更文件名'
						
						
						
						
						
						
					 | 
					
						2022-09-02 16:35:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e46c392e0f
					 | 
					
						
						
							
							'强制变更文件名,ureport国际化文件置入'
						
						
						
						
						
						
					 | 
					
						2022-09-02 16:34:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						076eaa5f2a
					 | 
					
						
						
							
							update 基本完成国际化
						
						
						
						
						
						
					 | 
					
						2022-09-02 15:16:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						12556886b9
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-09-02 11:33:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						744f288b70
					 | 
					
						
						
							
							update 到qualityInspectionCurrent
						
						
						
						
						
						
					 | 
					
						2022-09-02 10:59:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						64ee3cb64e
					 | 
					
						
						
							
							update 完成设备页面的国际化
						
						
						
						
						
						
					 | 
					
						2022-09-02 09:49:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						268207b383
					 | 
					
						
						
							
							update template
						
						
						
						
						
						
					 | 
					
						2022-09-02 09:02:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |