Commit Graph

354 Commits

Author SHA1 Message Date
caoqianming 2831c9b58b feat: HTML_BASE_URL 前缀统一修改 2025-04-24 13:00:43 +08:00
caoqianming 2238ab119d feat: mpoint增加存储表达式用于决定是否存储 2025-03-18 14:15:22 +08:00
zty 0dd62244ab feat: 修改采集更新时间换成 data_time 2025-03-05 18:36:07 +08:00
zty ea5e041575 feat: enm/task 修改班时校正 2025-02-27 14:28:32 +08:00
zty 095a6f9d51 feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型 2025-02-17 15:35:21 +08:00
zty 5f85d0273c feat: 修改enm/task 2025-02-12 17:34:04 +08:00
zty f7d6f59fcd feat: 修改 enm 回转窑产量计算 2025-02-11 14:24:59 +08:00
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 fa18fee720 feat:remove 碳排放强度计算和字段 2025-01-21 09:40:52 +08:00
zty bec6600089 feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑 2025-01-21 09:24:58 +08:00
zty cd652f3696 feat:enm/service 修改translate_eval_formula 2025-01-17 16:08:27 +08:00
zty b8b1167f17 feat: 增加氨水液位计 绑定字段up_down 计算方式 2025-01-16 13:56:20 +08:00
zty 9c3cf5a534 feat: enm/service 修改传入公式,校正计算测点 2025-01-16 11:18:36 +08:00
zty f2e5ce1d8d feat: enm 修改测点缓存 已存在 2025-01-02 16:33:27 +08:00
caoqianming 20d648957a feat: 重跑计算时添加日志 2024-12-30 15:15:42 +08:00
caoqianming ac7c3cd29c feat: mpoint增加筛选条件 2024-12-30 14:23:02 +08:00
caoqianming cd2f6eb77a feat: 原料磨用code处理 2024-12-27 17:16:48 +08:00
caoqianming 7f4acd2370 fix: objects.get_or_create 变更为safe_get_or_create用于解决并发冲突 2024-12-27 09:17:30 +08:00
caoqianming 1e4e80879f feat: 添加计算系数后的enm task修改 2024-12-25 15:24:26 +08:00
caoqianming 4b5308b0cc feat: 增加cal_coefficient_method 字段 2024-12-25 15:09:03 +08:00
caoqianming aae5c909c5 feat: enm mpoint 添加计算系数字段 2024-12-25 14:06:57 +08:00
caoqianming 039cb3108b fix: mpointstat safe_get_or_create 2024-12-24 22:08:43 +08:00
caoqianming 43509aa25a feat: mpointstat safe_get_or_create 2024-12-24 21:59:41 +08:00
caoqianming 71ab520f3e fix: enstat_cen_consume_unit change bug 2024-12-24 18:35:04 +08:00
caoqianming 4a642b9014 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 18:20:52 +08:00
caoqianming f90bcd530b feat: 变更enstat排序 2024-12-24 18:20:40 +08:00
zty 13c4fb6663 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 18:09:03 +08:00
zty bcaa69ab30 feat:task 修改 更新 bill_date 2024-12-24 18:09:01 +08:00
caoqianming 841ece1d4f feat: 工段计算公式校正 2024-12-24 17:54:46 +08:00
zty f5fd9558ba feat: 修改 task bill_date 2024-12-24 15:49:20 +08:00
zty aa3ba099be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-24 09:26:59 +08:00
zty 978d8f3577 feat: 增加定时任务 每天更新bill_date(出厂水泥采集) 2024-12-24 09:26:57 +08:00
caoqianming 27e3dfa3b3 feat: db_ins_mplogx bill_date bug 2024-12-23 18:31:02 +08:00
zty 0df2506f26 feat: 修改 enm/qua_data 排序问题 2024-12-18 14:16:11 +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 c1e958f2f9 feat: enstate note makemigration 2024-12-13 17:46:28 +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 e331002538 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-12-13 15:29:13 +08:00
zty 62a177b773 feat:登入 记录IP 和 增加每日的能源统计定时任务 2024-12-13 15:29:10 +08:00
caoqianming 0f920bae99 feat: 信号更新设备状态冲突时优先处理监测设备 2024-12-12 09:28:08 +08:00
caoqianming aadb9fdf2c feat: mpoint增加is_rep_ep0_running_state字段 2024-12-11 18:14:08 +08:00
caoqianming c79cc14f46 feat: mpoint增加is_rep_ep0_running_state字段 2024-12-11 17:54:45 +08:00
zty 44af9bc494 feat : 修改排班规则 2024-12-11 12:18:09 +08:00
zty e6cad72807 feat: enm 增加氨水消耗量 2024-12-10 14:12:16 +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