Commit Graph

1964 Commits

Author SHA1 Message Date
caoqianming 0fdaa0a7d5 feat: dpm加入url 2024-06-06 14:51:22 +08:00
caoqianming a14c411795 fix: base 调整handle_parent 2024-06-06 14:50:43 +08:00
caoqianming d36de5bc00 feat: 正式添加dpm模块 2024-06-06 14:50:14 +08:00
caoqianming d40389df76 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-06-06 09:13:13 +08:00
caoqianming 9e0241f209 fix: 改变培训级别以与风险点一致 2024-06-06 09:13:11 +08:00
zty b38f31ec35 fix: 修改node版本过高的bug 2024-06-05 16:37:02 +08:00
caoqianming 917f3ff52b feat: 增加edu 线下培训表 2024-06-05 14:43:39 +08:00
caoqianming 16ead75d3b feat: 获取子集的性能优化2 2024-06-05 14:07:50 +08:00
caoqianming a54030e9c0 feat: 获取子集的性能优化及删除提示 2024-06-05 12:50:47 +08:00
caoqianming 7b1013ea64 fix: 完善父子关系parent_link处理 2024-06-05 12:49:52 +08:00
caoqianming a590eb298b feat: base 增加parentmodel 2024-06-05 10:24:38 +08:00
caoqianming 2d7f1152ff fix: 只继承CustomGenericViewSet的设置perms_map为{}2 2024-06-05 10:24:18 +08:00
caoqianming 9c8d58c35c fix: 解决swagger显示错误 2024-06-05 09:31:51 +08:00
caoqianming 14e421dd5b fix: 只继承CustomGenericViewSet的设置perms_map为{} 2024-06-05 09:31:29 +08:00
caoqianming 5b8b262e42 feat: base 在第一次实例化时添加权限标识 2024-06-05 09:27:33 +08:00
caoqianming e656f3e542 feat: edu接口完善 2024-06-05 08:36:30 +08:00
caoqianming 8548004690 fix: 用于混料的原料不与车间库存交互 2024-06-04 09:11:06 +08:00
caoqianming 4f6610c821 feat: 添加questioncat_name字段 2024-06-03 17:42:08 +08:00
caoqianming db39aa6519 feat: 添加examlist can_attend返回 2024-06-03 17:41:46 +08:00
caoqianming 57acaa2e06 feat: examserializer增加返回数据 2024-06-03 10:08:25 +08:00
caoqianming f5428febf3 feat: 增加examdetail serializer 2024-06-03 08:40:28 +08:00
caoqianming 62b012b690 feat: base 增加get_queryset_custom 2024-06-03 08:36:02 +08:00
caoqianming e695543932 doc: CustomListmixin添加注释 2024-05-31 18:59:32 +08:00
caoqianming ac49088efa feat: 暂时去除多余的paper_json字段 2024-05-31 18:26:47 +08:00
caoqianming 84eaf31fff feat: examserializer添加字段 2024-05-31 18:26:24 +08:00
caoqianming bbee8defa8 feat: 修改drain字段属性 2024-05-31 16:39:25 +08:00
caoqianming 49f3341a01 feat: 添加edu模块 2024-05-31 15:42:15 +08:00
caoqianming 0fcecf9a64 feat: base 增加了baseserializermixin 2024-05-31 14:12:08 +08:00
caoqianming 0473be4d30 feat: 检验撤回test_date在count_notok时直接置空 2024-05-30 10:55:13 +08:00
caoqianming 458385c0f6 feat: material增加count_mb字段 2024-05-28 14:29:20 +08:00
caoqianming 2ac4f5b04f refector: get_analyse_data_mgroups_duration 增加run_hour返回 2024-05-22 17:11:46 +08:00
caoqianming 8627d5f9dc feat: 增加工段数据按任意时间范围分析 2024-05-22 17:04:51 +08:00
caoqianming bf5df19a59 feat: mlog添加两个不合格项目 2024-05-22 14:53:46 +08:00
caoqianming 7819aa5b5e feat: stlog的sflog的cascad改一下 2024-05-21 18:18:13 +08:00
caoqianming dd5b88e300 feat: 增加吨熟料电耗计算功能 2024-05-21 18:17:51 +08:00
caoqianming 138d202a28 fix: 监测工段是否运行的bug2去除多余逻辑 2024-05-21 17:59:11 +08:00
caoqianming 34386ae26d fix: 监测工段是否运行的bug去除多余逻辑 2024-05-21 17:47:18 +08:00
caoqianming 5e8bdcf1a8 fix: 监测工段是否运行的bug 2024-05-21 17:44:03 +08:00
caoqianming f66cd0f277 feat: base 优化邮件报错频率过高自动屏蔽else未处理 2024-05-21 15:07:13 +08:00
caoqianming a7d7a312f8 feat: base 优化邮件报错频率过高自动屏蔽 2024-05-21 15:00:13 +08:00
caoqianming e8ced88547 feat: 邮件报错频率过高自动屏蔽2 2024-05-21 14:48:28 +08:00
caoqianming 5e905519bf feat: 邮件报错频率过高自动屏蔽 2024-05-21 14:46:06 +08:00
caoqianming 2ed77b9f0f feat: base task_error携带self.name 2024-05-21 13:49:38 +08:00
caoqianming cdfa35851d feat: 算总煤耗时month_s以day_s相加 2024-05-21 11:34:23 +08:00
caoqianming 617013f299 fix: sflog展示run_hour 2024-05-17 09:16:45 +08:00
caoqianming 32c1647b9b feat: sflog展示run_hour 2024-05-17 09:13:10 +08:00
caoqianming bd33a33ed6 fix: get_pcoal_heat 逻辑严谨 2024-05-16 17:18:17 +08:00
caoqianming a90396099b fix: 更新煤粉热值触发计算的bug3 2024-05-16 16:57:00 +08:00
caoqianming 9a1074caf8 fix: 更新煤粉热值触发计算的bug 2024-05-16 16:48:42 +08:00
caoqianming 5093eb7b29 feat: 更新煤粉热值触发计算的bug 2024-05-16 16:26:33 +08:00