shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								fba62dc2c0
								
							
						 | 
						
							
							
								
								fix:更改计算系数
							
							
							
							
							
						 | 
						
							2024-05-08 16:11:45 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b32511f35e
								
							
						 | 
						
							
							
								
								fix:layout
							
							
							
							
							
						 | 
						
							2024-05-08 15:34:39 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								054829996e
								
							
						 | 
						
							
							
								
								fix:全厂能源电量消耗报表
							
							
							
							
							
						 | 
						
							2024-05-08 14:08:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4b52570a4d
								
							
						 | 
						
							
							
								
								feat: mpoint_form表格结构调整
							
							
							
							
							
						 | 
						
							2024-05-08 13:04:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8911a27b6d
								
							
						 | 
						
							
							
								
								feat: 移除mgroups_allocate字段2
							
							
							
							
							
						 | 
						
							2024-05-08 13:00:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								218f35dd60
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-05-08 12:55:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02b8364a51
								
							
						 | 
						
							
							
								
								feat: 移除mgroups_allocate字段
							
							
							
							
							
						 | 
						
							2024-05-08 12:55:07 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								a788587df4
								
							
						 | 
						
							
							
								
								feat:凌源的能管大屏基础版
							
							
							
							
							
						 | 
						
							2024-05-07 15:59:05 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								248b15440e
								
							
						 | 
						
							
							
								
								fix:去掉重复的路由
							
							
							
							
							
						 | 
						
							2024-05-07 15:58:17 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								e166bd7950
								
							
						 | 
						
							
							
								
								fix:路由处理(父级严格大于子级)
							
							
							
							
							
						 | 
						
							2024-05-07 11:25:58 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								cc5bff2c27
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-05-07 11:24:18 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d67ed6ce74
								
							
						 | 
						
							
							
								
								fix:路由变动,将日志详情提到enm_base中
							
							
							
							
							
						 | 
						
							2024-05-07 11:19:08 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								09e83c9fc0
								
							
						 | 
						
							
							
								
								fix:回转窑交接班日志
							
							
							
							
							
						 | 
						
							2024-05-07 10:01:38 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								267cfe4733
								
							
						 | 
						
							
							
								
								fix:增加计算公式页面
							
							
							
							
							
						 | 
						
							2024-05-06 17:10:48 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								44f3e3fc68
								
							
						 | 
						
							
							
								
								fix:设备分类增删改
							
							
							
							
							
						 | 
						
							2024-05-06 16:27:52 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								56b2d8de89
								
							
						 | 
						
							
							
								
								fix:日志报错修改
							
							
							
							
							
						 | 
						
							2024-05-06 14:48:03 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								bf8812452f
								
							
						 | 
						
							
							
								
								fix:大屏标题更改
							
							
							
							
							
						 | 
						
							2024-05-06 14:46:47 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								72cab70f23
								
							
						 | 
						
							
							
								
								fix:em中计量物料取消类型筛选
							
							
							
							
							
						 | 
						
							2024-05-06 11:20:42 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								9e4ac65994
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-05-06 10:02:40 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b4a6e3d811
								
							
						 | 
						
							
							
								
								fix:生产报告report中图标颜色及数据对应
							
							
							
							
							
						 | 
						
							2024-05-06 10:02:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								baa46135fb
								
							
						 | 
						
							
							
								
								feat: mpoint form添加关联环保字段2
							
							
							
							
							
						 | 
						
							2024-05-06 09:46:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								97dd1431ea
								
							
						 | 
						
							
							
								
								feat: mpoint form添加关联环保字段
							
							
							
							
							
						 | 
						
							2024-05-06 09:46:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								52762117cc
								
							
						 | 
						
							
							
								
								feat: mpoint form增加影响测点编号
							
							
							
							
							
						 | 
						
							2024-05-06 09:19:39 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b881449d11
								
							
						 | 
						
							
							
								
								fix:生产报告中小时数据的获取更正
							
							
							
							
							
						 | 
						
							2024-04-30 16:52:47 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								0135367fea
								
							
						 | 
						
							
							
								
								fix:石灰石破碎中生产报告不要小时;余热发电中生产报告的产量单位更正
							
							
							
							
							
						 | 
						
							2024-04-30 16:16:25 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								8b8ff3b48b
								
							
						 | 
						
							
							
								
								fix:数据统计图数据日期对应修正
							
							
							
							
							
						 | 
						
							2024-04-30 13:52:00 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								bd3ae583fc
								
							
						 | 
						
							
							
								
								fix:原料磨生产报告修改
							
							
							
							
							
						 | 
						
							2024-04-30 11:04:43 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								aee0427138
								
							
						 | 
						
							
							
								
								fix:水泥包装mgroup根据名称获取
							
							
							
							
							
						 | 
						
							2024-04-29 16:30:32 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								74e65ba199
								
							
						 | 
						
							
							
								
								fix:石灰石破碎mgroup根据名称获取
							
							
							
							
							
						 | 
						
							2024-04-29 16:18:45 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4e8a3d486a
								
							
						 | 
						
							
							
								
								fix:水泥磨mgroup根据名称获取
							
							
							
							
							
						 | 
						
							2024-04-29 16:11:57 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								63737587e1
								
							
						 | 
						
							
							
								
								fix:物料添加时增加排序
							
							
							
							
							
						 | 
						
							2024-04-29 15:32:02 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								25e2a1e9d6
								
							
						 | 
						
							
							
								
								fix:enm_kiln回转窑mgroup根据名称获取id
							
							
							
							
							
						 | 
						
							2024-04-29 15:10:39 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d392d7f012
								
							
						 | 
						
							
							
								
								fix:enm_rm原料磨mgroup 根据名称获取id
							
							
							
							
							
						 | 
						
							2024-04-29 14:29:25 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4188ad2a8b
								
							
						 | 
						
							
							
								
								fix:余热发电mgroup根据name获取
							
							
							
							
							
						 | 
						
							2024-04-29 13:49:37 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								93f058997a
								
							
						 | 
						
							
							
								
								fix:电石渣mgroup根据名称通过接口获取id
							
							
							
							
							
						 | 
						
							2024-04-29 11:12:25 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								6e7e535cfc
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-28 17:05:27 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								5b73a45e20
								
							
						 | 
						
							
							
								
								fix:日志异常改动,全场电量统计折线图
							
							
							
							
							
						 | 
						
							2024-04-28 17:05:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e8bb37d87f
								
							
						 | 
						
							
							
								
								feat: mpoint_form增加字段
							
							
							
							
							
						 | 
						
							2024-04-28 17:02:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12cb9a6bfb
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-04-28 14:14:14 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |