|  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 | 
				
					
						|  zty | 679165cbd0 | feat: db_insert_mplogx 添加限制参数 | 2024-08-06 17:12:58 +08:00 | 
				
					
						|  zty | 4d498f99a3 | fix: enm/task 水泥批号插入 | 2024-08-06 16:11:27 +08:00 | 
				
					
						|  zty | 50cdbf9428 | fix :enm/task 修改数据库连接 | 2024-08-06 10:53:01 +08:00 | 
				
					
						|  zty | f09a8fe4cd | add : db_ins_mplogx 增加测点插入数据库 | 2024-08-06 10:01:21 +08:00 | 
				
					
						|  caoqianming | fa56d61ffc | feat: 修改nowx使用aware | 2024-08-02 16:39:07 +08:00 | 
				
					
						|  caoqianming | dc7e6f9d03 | fix: get_total_sec_now及cal_exp_duration_sec 添加now参数 | 2024-08-02 13:50:05 +08:00 | 
				
					
						|  caoqianming | 757bf89d71 | fix: enstat hour_s查询时按真实事件查询 | 2024-08-02 10:50:22 +08:00 | 
				
					
						|  caoqianming | a589fec67e | feat: enstat2添加统计字段 | 2024-07-31 16:53:23 +08:00 | 
				
					
						|  caoqianming | 893781ec7f | feat: db_insert_mplogx不用thread | 2024-07-30 10:01:42 +08:00 | 
				
					
						|  caoqianming | 05b46b5351 | fix: EnvData get_or_create 避免报错 | 2024-07-29 08:38:57 +08:00 | 
				
					
						|  caoqianming | b0004ba12e | feat: mpointcache 存库时若测点不存在删除缓存 | 2024-07-25 10:51:54 +08:00 | 
				
					
						|  caoqianming | 83ec822f9d | fix: db_insert_mplogx bug | 2024-07-16 15:36:40 +08:00 | 
				
					
						|  caoqianming | d31cf4d143 | feat: 从数据库转存到超表做count限制 | 2024-07-16 14:50:50 +08:00 | 
				
					
						|  caoqianming | bf98ea8a48 | feat: 从数据库转存到超表 | 2024-07-16 14:06:46 +08:00 | 
				
					
						|  caoqianming | 9572614b02 | fix: enstat to_repre时若使用query时的bug | 2024-06-27 09:05:45 +08:00 |