caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								18942d57c9
								
							
						 | 
						
							
							
								
								fix: cal_enstat2 bug
							
							
							
							
							
						 | 
						
							2023-08-23 08:48:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								50714225e5
								
							
						 | 
						
							
							
								
								fix: cal_enstat2 bug
							
							
							
							
							
						 | 
						
							2023-08-23 08:45:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cd5cf00fad
								
							
						 | 
						
							
							
								
								fix: cal_enstat bug
							
							
							
							
							
						 | 
						
							2023-08-23 08:39:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cd2c0f85b
								
							
						 | 
						
							
							
								
								feat: enstat2增加day_s统计及相应的tasks改动
							
							
							
							
							
						 | 
						
							2023-08-23 08:33:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								11ced96400
								
							
						 | 
						
							
							
								
								feat: ecm filter 查询
							
							
							
							
							
						 | 
						
							2023-08-22 14:28:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								315f832ff2
								
							
						 | 
						
							
							
								
								fix: 先调整回来再处理
							
							
							
							
							
						 | 
						
							2023-08-22 14:10:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74e81e1a7c
								
							
						 | 
						
							
							
								
								feat: ecm filter 查询
							
							
							
							
							
						 | 
						
							2023-08-22 14:06:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a0135ec965
								
							
						 | 
						
							
							
								
								feat: compress img 默认40kb
							
							
							
							
							
						 | 
						
							2023-08-22 13:58:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								31b0f33751
								
							
						 | 
						
							
							
								
								feat: 提高导出限制
							
							
							
							
							
						 | 
						
							2023-08-22 13:56:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c615d20a5c
								
							
						 | 
						
							
							
								
								feat: 提高导出限制
							
							
							
							
							
						 | 
						
							2023-08-22 13:55:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab9b9d9804
								
							
						 | 
						
							
							
								
								fix: event 导出bug
							
							
							
							
							
						 | 
						
							2023-08-22 11:25:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								563893efac
								
							
						 | 
						
							
							
								
								feat: event增加压缩图片字段
							
							
							
							
							
						 | 
						
							2023-08-22 11:13:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								39a3001211
								
							
						 | 
						
							
							
								
								fix: 导出时用压缩图
							
							
							
							
							
						 | 
						
							2023-08-22 10:42:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ba12d06da
								
							
						 | 
						
							
							
								
								feat: global img 压缩
							
							
							
							
							
						 | 
						
							2023-08-22 10:33:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0772be47de
								
							
						 | 
						
							
							
								
								fix: 导出时的bug
							
							
							
							
							
						 | 
						
							2023-08-22 09:20:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6f7a732618
								
							
						 | 
						
							
							
								
								feat: ecm 提高导出数据限制
							
							
							
							
							
						 | 
						
							2023-08-22 09:12:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a8160867ae
								
							
						 | 
						
							
							
								
								feat: 返回数据自动约成2位小数
							
							
							
							
							
						 | 
						
							2023-08-21 14:08:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b31d3937f8
								
							
						 | 
						
							
							
								
								feat: enstat2 增加水耗和压缩空气统计
							
							
							
							
							
						 | 
						
							2023-08-21 09:18:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad9027d888
								
							
						 | 
						
							
							
								
								fix: 煤粉热值取白班值
							
							
							
							
							
						 | 
						
							2023-08-17 15:05:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdf67b5dc5
								
							
						 | 
						
							
							
								
								fix: mpointstat增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-15 16:00:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dbe1635788
								
							
						 | 
						
							
							
								
								feat: mpointstat增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-15 15:56:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2c8a86d6f5
								
							
						 | 
						
							
							
								
								fix: if hour改为if hour is not None
							
							
							
							
							
						 | 
						
							2023-08-15 15:49:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fba349191c
								
							
						 | 
						
							
							
								
								feat: 作业未选证书时默认选择全部该成员全部证书
							
							
							
							
							
						 | 
						
							2023-08-10 17:12:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc53fd14f
								
							
						 | 
						
							
							
								
								fix: month_st计算bug
							
							
							
							
							
						 | 
						
							2023-08-09 15:07:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fef37ebcd7
								
							
						 | 
						
							
							
								
								feat: enstat list返回数据打平2
							
							
							
							
							
						 | 
						
							2023-08-09 14:20:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ee3eb4db3
								
							
						 | 
						
							
							
								
								feat: mpintstat增加mgroup name查询条件
							
							
							
							
							
						 | 
						
							2023-08-09 13:27:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								584e5dc5c3
								
							
						 | 
						
							
							
								
								feat: enstat list返回数据打平
							
							
							
							
							
						 | 
						
							2023-08-09 13:17:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ccfeb9d901
								
							
						 | 
						
							
							
								
								feat: sflogexp合并stlog
							
							
							
							
							
						 | 
						
							2023-08-08 14:41:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f4e3d43034
								
							
						 | 
						
							
							
								
								fix: 增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-08 11:01:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c43474dace
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2023-08-07 16:00:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								959e3e3d8d
								
							
						 | 
						
							
							
								
								feat: enstat增加start_time和end_time的查询条件
							
							
							
							
							
						 | 
						
							2023-08-07 16:00:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d26a7d5805
								
							
						 | 
						
							
							
								
								fix: update_dict bug
							
							
							
							
							
						 | 
						
							2023-08-04 18:24:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f42d8386e
								
							
						 | 
						
							
							
								
								feat: eval_formula测试通过
							
							
							
							
							
						 | 
						
							2023-08-04 16:57:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5cfb12113e
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 时不做mgroup绑定allocate处理2
							
							
							
							
							
						 | 
						
							2023-08-04 16:14:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4157fd95a8
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 时不做mgroup绑定allocate处理
							
							
							
							
							
						 | 
						
							2023-08-04 16:00:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								039876349e
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 错误
							
							
							
							
							
						 | 
						
							2023-08-04 15:34:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								866ad4d15d
								
							
						 | 
						
							
							
								
								feat: mpoint创建时校验问题
							
							
							
							
							
						 | 
						
							2023-08-04 15:17:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dcd338e5fa
								
							
						 | 
						
							
							
								
								feat: mpointstat增加返回内容
							
							
							
							
							
						 | 
						
							2023-08-04 14:53:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								448285e3a1
								
							
						 | 
						
							
							
								
								feat: 增加enstat筛选条件
							
							
							
							
							
						 | 
						
							2023-08-04 14:35:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8808a14ef2
								
							
						 | 
						
							
							
								
								fix: translate_eval_formula bug
							
							
							
							
							
						 | 
						
							2023-08-04 14:34:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								50a34a44bb
								
							
						 | 
						
							
							
								
								feat: 只更新必要的字段
							
							
							
							
							
						 | 
						
							2023-08-04 14:29:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebe6ab9f3b
								
							
						 | 
						
							
							
								
								feat: 增加生产异常动态记录表
							
							
							
							
							
						 | 
						
							2023-08-04 14:26:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4e5adc6dc3
								
							
						 | 
						
							
							
								
								feat: 获取工段全年目标
							
							
							
							
							
						 | 
						
							2023-08-04 14:26:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2be3c43bef
								
							
						 | 
						
							
							
								
								feat: 添加enstat2路由
							
							
							
							
							
						 | 
						
							2023-08-04 14:25:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16971d9742
								
							
						 | 
						
							
							
								
								feat: 返回时携带ep_monitored_name
							
							
							
							
							
						 | 
						
							2023-08-04 09:55:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								959fc60e24
								
							
						 | 
						
							
							
								
								feat: 获取工段全年目标值
							
							
							
							
							
						 | 
						
							2023-08-04 09:24:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c7b7d9cec4
								
							
						 | 
						
							
							
								
								fix: cal_enstat_when_pcoal_heat_change的qs获取bug
							
							
							
							
							
						 | 
						
							2023-08-03 14:09:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7fd10f3e51
								
							
						 | 
						
							
							
								
								fix: pcoal_coal_consume可能为None
							
							
							
							
							
						 | 
						
							2023-08-03 13:58:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb60fe2728
								
							
						 | 
						
							
							
								
								feat: 其他成本数据忘记保存
							
							
							
							
							
						 | 
						
							2023-08-03 13:33:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac0908dc11
								
							
						 | 
						
							
							
								
								fix: month_st时equip_data计算失误
							
							
							
							
							
						 | 
						
							2023-08-03 11:16:04 +08:00 |