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 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								038e7f86cd
								
							
						 | 
						
							
							
								
								feat: xscript相关调整
							
							
							
							
							
						 | 
						
							2024-08-28 14:11:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4bfa8a5460
								
							
						 | 
						
							
							
								
								feat: insert_mplogx_from_xscript 修改
							
							
							
							
							
						 | 
						
							2024-08-27 18:42:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								417dae76fd
								
							
						 | 
						
							
							
								
								fix: xscript update bug
							
							
							
							
							
						 | 
						
							2024-08-27 17:40:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2be34d3caa
								
							
						 | 
						
							
							
								
								feat: enm添加xscript
							
							
							
							
							
						 | 
						
							2024-08-27 17:28:30 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								28834f88cd
								
							
						 | 
						
							
							
								
								fix : 煤磨
							
							
							
							
							
						 | 
						
							2024-08-23 17:20:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4960ee7fac
								
							
						 | 
						
							
							
								
								feat: 增加水泥包装
							
							
							
							
							
						 | 
						
							2024-08-21 17:55:23 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5a35ea6028
								
							
						 | 
						
							
							
								
								feat: 增加出厂水泥 和 计算
							
							
							
							
							
						 | 
						
							2024-08-21 08:59:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								206e33d091
								
							
						 | 
						
							
							
								
								fix :apps\enm filter
							
							
							
							
							
						 | 
						
							2024-08-20 14:43:53 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c3b62f1831
								
							
						 | 
						
							
							
								
								fix: equip_elec_data 计算
							
							
							
							
							
						 | 
						
							2024-08-16 18:45:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7a780ebd0d
								
							
						 | 
						
							
							
								
								fix: set coefficient
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cbce4998d9
								
							
						 | 
						
							
							
								
								feat: mpoint stat添加筛选条件
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:30 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4cdc48e549
								
							
						 | 
						
							
							
								
								fix: equip_elec_data 计算
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:00 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								13fb91e83a
								
							
						 | 
						
							
							
								
								fix:enm/service 修改稿last_val
							
							
							
							
							
						 | 
						
							2024-08-15 10:47:43 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f52b501aa1
								
							
						 | 
						
							
							
								
								feat : enm/service 增加测点采集系数
							
							
							
							
							
						 | 
						
							2024-08-15 09:19:19 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								47acf9ceb4
								
							
						 | 
						
							
							
								
								fix: enm/service 修改service
							
							
							
							
							
						 | 
						
							2024-08-12 16:04:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								169a31da5a
								
							
						 | 
						
							
							
								
								fix : apps/em /enm  更改缓存存储
							
							
							
							
							
						 | 
						
							2024-08-08 14:52:36 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								6bdc5a04aa
								
							
						 | 
						
							
							
								
								fix :enm service.py  修改缓存不存在直接返回
							
							
							
							
							
						 | 
						
							2024-08-07 09:30:56 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f97c99bf8a
								
							
						 | 
						
							
							
								
								fix: cal_mpointstat_hour对于is_unit的计算错误
							
							
							
							
							
						 | 
						
							2024-08-06 17:52:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								91e9ac38f6
								
							
						 | 
						
							
							
								
								fix: db_insert_mplogx_batch bug
							
							
							
							
							
						 | 
						
							2024-08-06 17:22:28 +08:00 |