Commit Graph

55 Commits

Author SHA1 Message Date
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 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 da3b0f62e5 feat: 增加change_data字段 2024-08-28 17:09:24 +08:00
caoqianming 038e7f86cd feat: xscript相关调整 2024-08-28 14:11:42 +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 47acf9ceb4 fix: enm/service 修改service 2024-08-12 16:04:55 +08:00
caoqianming 9572614b02 fix: enstat to_repre时若使用query时的bug 2024-06-27 09:05:45 +08:00
caoqianming 643efa448e fix: mpointserializer获取last_data优化 2024-06-24 16:45:05 +08:00
caoqianming 8627d5f9dc feat: 增加工段数据按任意时间范围分析 2024-05-22 17:04:51 +08:00
caoqianming 413ac262af feat: mpointstat 增加correct功能 2024-05-16 10:24:33 +08:00
caoqianming b4b3d6eadc feat: hour计数改为sec计数 步骤2 2024-05-15 10:31:17 +08:00
caoqianming 69e75cc1d7 feat: mpointstat手动录入在create时校验唯一 2024-05-10 16:38:42 +08:00
caoqianming 30974d90b0 feat: 移除mgroups_allocate字段 2024-05-08 12:09:21 +08:00
caoqianming 1cb9b3495a feat: mpoitstatserializer增加mpoint_nickname返回 2024-05-07 13:50:13 +08:00
caoqianming c179d91ebd feat: 采集逻辑优化 2024-04-28 09:34:33 +08:00
caoqianming 00e3129751 feat: 设备运行状态的缓存优化 2024-04-25 15:12:39 +08:00
caoqianming 86053bed93 feat: mpoint增加是否可手动录入的字段 2024-04-24 14:59:37 +08:00
caoqianming dfaed5e5e5 feat: 采集逻辑整体重构 2024-04-16 15:03:59 +08:00
caoqianming 0fdb230822 feat: mplog视图层转mplogx 2024-04-11 10:58:33 +08:00
caoqianming f5f0675f91 feat: 增加recal接口 2023-08-28 09:42:27 +08:00
caoqianming 7bfea08a7d feat: mpointstat增加elec_consume_unit及相应逻辑 2023-08-25 17:01:22 +08:00
caoqianming 6e1ab8a967 feat: enstat2 返回时保留2位小数 2023-08-24 10:28:07 +08:00
caoqianming a8160867ae feat: 返回数据自动约成2位小数 2023-08-21 14:08:47 +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 16971d9742 feat: 返回时携带ep_monitored_name 2023-08-04 09:55:26 +08:00
caoqianming e1e8d76ecf fix: formula 允许为空 2023-08-02 15:20:06 +08:00
caoqianming a668ca0b2f feat: 返回数据增加belong_dept_name等 2023-07-25 14:24:21 +08:00
caoqianming b634bac616 feat: sflog获取年月日优化 2023-07-25 11:23:36 +08:00
caoqianming c3d0fa1806 feat: mgroups_allocate保存时带mgroup_name 2023-07-11 14:29:32 +08:00
caoqianming c0e4b8a1b9 fix: 比例合计问题 2023-07-11 14:21:36 +08:00
caoqianming bf1ac0549e feat: mpointstat增加mgroup字段和相应逻辑 2023-07-11 13:46:37 +08:00
caoqianming c122335f8c feat: 支持测点数据反向分配给各工段 2023-07-11 10:53:28 +08:00
caoqianming caaeb32817 feat: 增加能耗统计记录表 2023-07-10 13:45:22 +08:00
caoqianming 2884becf3f feat: 测点统计任务优化 2023-07-10 10:13:45 +08:00
caoqianming 9498e5eb22 feat: 测点统计记录支持手动创建 2023-07-06 17:03:28 +08:00
caoqianming 6b0e0fae3b feat: mpoint serializer增加material_name 2023-06-30 14:15:59 +08:00
caoqianming f6a15be31d feat: mpoint增加material字段 2023-06-30 12:09:57 +08:00
caoqianming 783869638f fix: mpoint添加时mgroup必填 2023-06-27 16:08:45 +08:00
caoqianming ddd3f6a5f0 feat: 测点统计表接口 2023-06-25 17:09:19 +08:00
caoqianming 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00