Commit Graph

83 Commits

Author SHA1 Message Date
caoqianming 957938f8dd feat: mpoint添加search字段 2025-02-08 11:09:58 +08:00
zty 4254e226d3 feat: enm/view 修改correct 增加不能校正当日或当月数据 2025-01-21 12:45:51 +08:00
zty f2e5ce1d8d feat: enm 修改测点缓存 已存在 2025-01-02 16:33:27 +08:00
caoqianming ac7c3cd29c feat: mpoint增加筛选条件 2024-12-30 14:23:02 +08:00
caoqianming aae5c909c5 feat: enm mpoint 添加计算系数字段 2024-12-25 14:06:57 +08:00
caoqianming f90bcd530b feat: 变更enstat排序 2024-12-24 18:20:40 +08:00
caoqianming 28d89176e6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-13 18:09:45 +08:00
caoqianming 5572b4cb0f feat: enstat update权限 2024-12-13 18:09:29 +08:00
zty d364a0ae1e fix: enstatupdateserializer 2024-12-13 17:41:50 +08:00
caoqianming 005b5c1057 feat: 增加enstat note字段 2024-12-13 17:05:02 +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 c0f796f4a0 fix: em/service 修改tkx 设备model 2024-11-26 17:54:59 +08:00
caoqianming c1d140a082 feat: mpointstat filterset 支持hour,day,month,year 2024-11-12 15:26:02 +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
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 038e7f86cd feat: xscript相关调整 2024-08-28 14:11:42 +08:00
caoqianming 2be34d3caa feat: enm添加xscript 2024-08-27 17:28:30 +08:00
caoqianming 02d672a39d feat: 增加mpoint查询条件 2024-06-26 10:11:21 +08:00
caoqianming 8627d5f9dc feat: 增加工段数据按任意时间范围分析 2024-05-22 17:04:51 +08:00
caoqianming f10cf8d67d fix: mpoitstat correct 时save 出错 2024-05-16 11:29:57 +08:00
caoqianming 1574499874 fix: mpoitstat correct 时调用错误3 2024-05-16 11:27:27 +08:00
caoqianming ee77a60d32 fix: mpoitstat correct 时调用错误2 2024-05-16 11:21:20 +08:00
caoqianming 6bb6a2d2d7 fix: mpointstat correct功能传参错误 2024-05-16 10:50:15 +08:00
caoqianming 413ac262af feat: mpointstat 增加correct功能 2024-05-16 10:24:33 +08:00
caoqianming f6f342e552 feat: mpointview增加查询条件 2024-05-11 10:18:27 +08:00
caoqianming d5b5014bf9 fix: cal_mpointstat_manual传参错误 2024-05-10 16:25:01 +08:00
caoqianming ebccaa2a50 feat: customlist替代listmixin 2024-05-10 09:13:08 +08:00
caoqianming a9b2d67302 feat: mpointview增加查询条件 2024-05-10 08:52:12 +08:00
caoqianming ec9260f353 feat: mpointstat增加排序条件 2024-05-07 13:37:10 +08:00
caoqianming 6cd255173f refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码 2024-05-06 00:06:08 +08:00
caoqianming 3a0d229ec0 feat: mpoint view增加查询条件 2024-04-29 21:31:28 +08:00
caoqianming 61e84bd302 feat: mpoint增加查询条件need_display 2024-04-28 17:52:12 +08:00
caoqianming b803cac69f fix: 测点orderingbug 2024-04-28 10:10:49 +08:00