caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								efdbc4fd94
								
							
						 | 
						
							
							
								
								feat: mpoint界面修改
							
							
							
							
							
						 | 
						
							2024-04-28 14:14:13 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								de77f4eaee
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-26 17:03:35 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								0bff96af1c
								
							
						 | 
						
							
							
								
								fix:异常添加
							
							
							
							
							
						 | 
						
							2024-04-26 17:03:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0460e2636f
								
							
						 | 
						
							
							
								
								fix: enm mgroup 不预先筛选
							
							
							
							
							
						 | 
						
							2024-04-26 12:20:50 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								dbd019d0ef
								
							
						 | 
						
							
							
								
								fix:煤磨mgroup接口获取
							
							
							
							
							
						 | 
						
							2024-04-26 10:41:11 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ffc08a38de
								
							
						 | 
						
							
							
								
								fix:煤磨mgroup通过名称获取
							
							
							
							
							
						 | 
						
							2024-04-26 10:28:08 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								939129b5df
								
							
						 | 
						
							
							
								
								fix:删除多余文件
							
							
							
							
							
						 | 
						
							2024-04-26 10:03:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0b3531131c
								
							
						 | 
						
							
							
								
								fix: enum下拉不显示的bug需parseInt
							
							
							
							
							
						 | 
						
							2024-04-25 00:23:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4b8347185a
								
							
						 | 
						
							
							
								
								fix: indicate_mgroup_running清空时设为null
							
							
							
							
							
						 | 
						
							2024-04-25 00:22:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3f331eec9f
								
							
						 | 
						
							
							
								
								fix: 展示组合件信息的bug
							
							
							
							
							
						 | 
						
							2024-04-25 00:11:33 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								838e71ad98
								
							
						 | 
						
							
							
								
								fix:更换凌源模型并适当调整
							
							
							
							
							
						 | 
						
							2024-04-24 16:52:20 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								f6c3cf410e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 16:04:41 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								2312537af2
								
							
						 | 
						
							
							
								
								fix:设备历史检测图y隐藏axisLabel
							
							
							
							
							
						 | 
						
							2024-04-24 16:04:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6be5494f1a
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 15:50:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d051748cf0
								
							
						 | 
						
							
							
								
								feat: mgroup_form 排班规则可clear
							
							
							
							
							
						 | 
						
							2024-04-24 15:50:30 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								241f14c324
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 15:42:46 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								6fb1ff7b17
								
							
						 | 
						
							
							
								
								fix:采购入库检验放开撤回
							
							
							
							
							
						 | 
						
							2024-04-24 15:42:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6c0703eac1
								
							
						 | 
						
							
							
								
								feat: 完善productTypeEnum
							
							
							
							
							
						 | 
						
							2024-04-24 15:19:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12eff830f3
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 15:08:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ffdca6f68
								
							
						 | 
						
							
							
								
								feat: mpoint form添加can_manual
							
							
							
							
							
						 | 
						
							2024-04-24 15:08:14 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								2cd956e123
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 14:31:16 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ab4b0c030d
								
							
						 | 
						
							
							
								
								fix:入库检验数据回显问题
							
							
							
							
							
						 | 
						
							2024-04-24 14:31:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c827b50d62
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-24 09:53:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5300b425d7
								
							
						 | 
						
							
							
								
								feat: 设备管理页面优化
							
							
							
							
							
						 | 
						
							2024-04-24 09:53:24 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								51c79f1d6f
								
							
						 | 
						
							
							
								
								fix:table滚动条和设备分类选择框颜色
							
							
							
							
							
						 | 
						
							2024-04-23 16:05:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cc204c594
								
							
						 | 
						
							
							
								
								feat: 设备管理添加一些字段及部分调整
							
							
							
							
							
						 | 
						
							2024-04-23 13:43:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								841f2a27f8
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-23 13:27:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebe61dfde4
								
							
						 | 
						
							
							
								
								feat: 相关方证书删除后刷新
							
							
							
							
							
						 | 
						
							2024-04-23 13:27:11 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								e02c11634d
								
							
						 | 
						
							
							
								
								fix:光子添加库存检验撤回
							
							
							
							
							
						 | 
						
							2024-04-22 15:36:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02b03770c3
								
							
						 | 
						
							
							
								
								fix: 工段表单及相关文件表述修改
							
							
							
							
							
						 | 
						
							2024-04-18 14:46:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9286ad0d73
								
							
						 | 
						
							
							
								
								fix: 设备分类显示调整
							
							
							
							
							
						 | 
						
							2024-04-18 14:45:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								36ebdd00f6
								
							
						 | 
						
							
							
								
								feat: enp调整viewer环境亮度
							
							
							
							
							
						 | 
						
							2024-04-17 15:34:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dfe4f1d1c3
								
							
						 | 
						
							
							
								
								fix: 打包时使用服务器host获取厂区模型
							
							
							
							
							
						 | 
						
							2024-04-17 15:04:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e1d846cd2d
								
							
						 | 
						
							
							
								
								fix: 无用文件
							
							
							
							
							
						 | 
						
							2024-04-17 14:38:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d2b82c290a
								
							
						 | 
						
							
							
								
								fix: babylonjs加载material的引入包错误
							
							
							
							
							
						 | 
						
							2024-04-17 14:37:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aa2a4c136c
								
							
						 | 
						
							
							
								
								fix: enp 设备状态查询的优化
							
							
							
							
							
						 | 
						
							2024-04-17 11:02:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2ce50e7bac
								
							
						 | 
						
							
							
								
								Revert "fix:排放系统登陆页面更改样式"
							
							
							
							
							
							
							
							This reverts commit 89f05ee8e8. 
							
						 | 
						
							2024-04-16 16:54:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								373b461549
								
							
						 | 
						
							
							
								
								feat: mioitem成品库展示组合件信息
							
							
							
							
							
						 | 
						
							2024-04-13 11:29:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02d4e94cbc
								
							
						 | 
						
							
							
								
								feat: 添加静态图片
							
							
							
							
							
						 | 
						
							2024-04-13 10:47:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdd58501f2
								
							
						 | 
						
							
							
								
								fix: 7车间和10车间大屏修改
							
							
							
							
							
						 | 
						
							2024-04-13 10:46:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e2eb647351
								
							
						 | 
						
							
							
								
								fix: 仓库执行人从库管中获取
							
							
							
							
							
						 | 
						
							2024-04-12 16:45:30 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								20881c4e4e
								
							
						 | 
						
							
							
								
								fix:格式化某一月
							
							
							
							
							
						 | 
						
							2024-04-12 15:21:13 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								89f05ee8e8
								
							
						 | 
						
							
							
								
								fix:排放系统登陆页面更改样式
							
							
							
							
							
						 | 
						
							2024-04-12 14:37:16 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								16bf29cd4f
								
							
						 | 
						
							
							
								
								feat:凌源电量消耗报表
							
							
							
							
							
						 | 
						
							2024-04-12 13:30:45 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ad3f90c293
								
							
						 | 
						
							
							
								
								fix:日志提交时班组默认
							
							
							
							
							
						 | 
						
							2024-04-11 17:31:56 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								50ec90045a
								
							
						 | 
						
							
							
								
								fix:mioitem_check
							
							
							
							
							
						 | 
						
							2024-04-11 17:03:04 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d07bdb77d8
								
							
						 | 
						
							
							
								
								fix:更改监控设备端口号
							
							
							
							
							
						 | 
						
							2024-04-11 14:49:43 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								1c4eb04604
								
							
						 | 
						
							
							
								
								fifix:更新jquery版本
							
							
							
							
							
						 | 
						
							2024-04-11 14:49:10 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								bbff16431d
								
							
						 | 
						
							
							
								
								fix:添加material中的cate选项
							
							
							
							
							
						 | 
						
							2024-04-11 14:48:38 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								43ecf55818
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-10 17:20:52 +08:00 |