zty
							
						 | 
						
							
							
							
							
							
								
							
							
								44af9bc494
								
							
						 | 
						
							
							
								
								feat : 修改排班规则
							
							
							
							
							
						 | 
						
							2024-12-11 12:18:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e6cad72807
								
							
						 | 
						
							
							
								
								feat: enm 增加氨水消耗量
							
							
							
							
							
						 | 
						
							2024-12-10 14:12:16 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e0915676e3
								
							
						 | 
						
							
							
								
								feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。
							
							
							
							
							
						 | 
						
							2024-12-09 09:46:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1b3bfabd55
								
							
						 | 
						
							
							
								
								feat: mpoint增加查询条件
							
							
							
							
							
						 | 
						
							2024-12-06 19:26:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f35b78604
								
							
						 | 
						
							
							
								
								feat: 调整enstat和mpointstat排序
							
							
							
							
							
						 | 
						
							2024-12-06 18:23:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								05beed5146
								
							
						 | 
						
							
							
								
								feat: enm enstat调整一下排序
							
							
							
							
							
						 | 
						
							2024-12-06 17:26:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3cfc4393de
								
							
						 | 
						
							
							
								
								feat: mpointvalues 聚合查询bug
							
							
							
							
							
						 | 
						
							2024-12-06 15:05:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c0160f556
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-12-06 14:46:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0cf481a69b
								
							
						 | 
						
							
							
								
								feat: enm end_time 查询包前不包后
							
							
							
							
							
						 | 
						
							2024-12-06 14:46:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								3901a57986
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-12-06 13:55:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								8c059fabe4
								
							
						 | 
						
							
							
								
								feat: enm/view  增加一个返回字段(峰谷平用)
							
							
							
							
							
						 | 
						
							2024-12-06 13:55:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								438406842d
								
							
						 | 
						
							
							
								
								feat: enstat提供排序条件2
							
							
							
							
							
						 | 
						
							2024-12-06 13:25:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ba0ddaaa9
								
							
						 | 
						
							
							
								
								feat: enstat提供排序条件
							
							
							
							
							
						 | 
						
							2024-12-06 13:24:06 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								22abc35d4b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-12-05 15:22:35 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								918df6b345
								
							
						 | 
						
							
							
								
								feat: 新增tkx 测点 聚合
							
							
							
							
							
						 | 
						
							2024-12-05 15:22:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								62fae4ceac
								
							
						 | 
						
							
							
								
								feat: mpoint增加筛选条件
							
							
							
							
							
						 | 
						
							2024-12-05 15:09:27 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c4c50670fd
								
							
						 | 
						
							
							
								
								feat: 修改 tkx 峰谷平
							
							
							
							
							
						 | 
						
							2024-12-04 16:08:43 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								284dc01f69
								
							
						 | 
						
							
							
								
								add : enm/filter 增加峰谷平查询字段
							
							
							
							
							
						 | 
						
							2024-12-03 18:27:48 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								55b8564f0d
								
							
						 | 
						
							
							
								
								feat:tkx 计量设备临期预警
							
							
							
							
							
						 | 
						
							2024-12-03 18:02:17 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a08e66a06a
								
							
						 | 
						
							
							
								
								fix: task bug 修字段名
							
							
							
							
							
						 | 
						
							2024-12-02 15:36:36 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0169d25ac
								
							
						 | 
						
							
							
								
								add : enm 增加峰谷平电量统计
							
							
							
							
							
						 | 
						
							2024-12-02 15:26:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								2f31997b43
								
							
						 | 
						
							
							
								
								feat: enm/task 修改报警事件
							
							
							
							
							
						 | 
						
							2024-11-28 16:13:00 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0f796f4a0
								
							
						 | 
						
							
							
								
								fix: em/service 修改tkx 设备model
							
							
							
							
							
						 | 
						
							2024-11-26 17:54:59 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9db524dfdb
								
							
						 | 
						
							
							
								
								feat: em/filter apps 修改设备字段信息
							
							
							
							
							
						 | 
						
							2024-11-25 18:14:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								3fff294189
								
							
						 | 
						
							
							
								
								fix : enm 修改 单位产品综合能耗
							
							
							
							
							
						 | 
						
							2024-11-18 13:51:04 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c2cae12c4f
								
							
						 | 
						
							
							
								
								fix:enm/service 修改小数点
							
							
							
							
							
						 | 
						
							2024-11-18 09:34:27 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9d5d7eceaf
								
							
						 | 
						
							
							
								
								fix : tkx enm bug fix
							
							
							
							
							
						 | 
						
							2024-11-14 17:48:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d140a082
								
							
						 | 
						
							
							
								
								feat: mpointstat filterset 支持hour,day,month,year
							
							
							
							
							
						 | 
						
							2024-11-12 15:26:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c8e0081e2
								
							
						 | 
						
							
							
								
								feat: 修改 last_val - first_val 值
							
							
							
							
							
						 | 
						
							2024-11-07 16:50:11 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								8ec5f8c6dd
								
							
						 | 
						
							
							
								
								feat: enm 回转窑综合电耗计算
							
							
							
							
							
						 | 
						
							2024-11-06 10:43:45 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								336f35ed28
								
							
						 | 
						
							
							
								
								feat:修改喇叭内容
							
							
							
							
							
						 | 
						
							2024-11-05 13:34:42 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								1ff55c6ee4
								
							
						 | 
						
							
							
								
								feat: apps/enm/view 修改offline状态
							
							
							
							
							
						 | 
						
							2024-10-29 09:36:28 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e6e18c6c30
								
							
						 | 
						
							
							
								
								feat: enm/task nick_name
							
							
							
							
							
						 | 
						
							2024-10-15 09:54:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								96f4b0c445
								
							
						 | 
						
							
							
								
								feat: apps/enm 新增成本计算
							
							
							
							
							
						 | 
						
							2024-10-10 13:33:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								66af6475d9
								
							
						 | 
						
							
							
								
								feat: 修改采集时候出现0的处理
							
							
							
							
							
						 | 
						
							2024-10-09 09:26:29 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c6e8f5992
								
							
						 | 
						
							
							
								
								fix: 电表水表0值处理
							
							
							
							
							
						 | 
						
							2024-09-30 16:21:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								956500d3aa
								
							
						 | 
						
							
							
								
								fix :enm/serializer round
							
							
							
							
							
						 | 
						
							2024-09-26 15:56:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								008219e9ba
								
							
						 | 
						
							
							
								
								fix : em enm wpm 修改更新设备运行状态
							
							
							
							
							
						 | 
						
							2024-09-25 16:03:59 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								d5e48c1ab8
								
							
						 | 
						
							
							
								
								fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
							
							
							
							
							
						 | 
						
							2024-09-23 10:04:43 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								0453499ee5
								
							
						 | 
						
							
							
								
								add: new migrations file
							
							
							
							
							
						 | 
						
							2024-09-13 15:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7aae49b378
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-09-13 13:41:29 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c4607e1608
								
							
						 | 
						
							
							
								
								fix /enm/service.py 停机时间短  无班组 加入异常原因
							
							
							
							
							
						 | 
						
							2024-09-13 13:40:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								81a90f31cd
								
							
						 | 
						
							
							
								
								feat: 计算测点可不指定物料2
							
							
							
							
							
						 | 
						
							2024-08-29 13:47:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0f0bc9bd37
								
							
						 | 
						
							
							
								
								feat: 计算测点可不指定物料
							
							
							
							
							
						 | 
						
							2024-08-29 10:28:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e94996471f
								
							
						 | 
						
							
							
								
								feat: 优化enstat2
							
							
							
							
							
						 | 
						
							2024-08-29 09:28:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cf10f02829
								
							
						 | 
						
							
							
								
								fix: xscript change_data 变更
							
							
							
							
							
						 | 
						
							2024-08-28 17:14:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da3b0f62e5
								
							
						 | 
						
							
							
								
								feat: 增加change_data字段
							
							
							
							
							
						 | 
						
							2024-08-28 17:09:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4ac5d1f1f7
								
							
						 | 
						
							
							
								
								feat: xscript添加logger
							
							
							
							
							
						 | 
						
							2024-08-28 16:27:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								43d0d90e41
								
							
						 | 
						
							
							
								
								fix: tag_update 先判断是否本地时间
							
							
							
							
							
						 | 
						
							2024-08-28 16:17:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								730aa68966
								
							
						 | 
						
							
							
								
								feat: tag_update 先判断是否本地时间
							
							
							
							
							
						 | 
						
							2024-08-28 16:12:31 +08:00 |