 caoqianming
|
966821fad6
|
feat: 交接记录提交只要是同部门的就可以
|
2024-06-21 10:40:07 +08:00 |
|
caoqianming
|
96e96ef8cc
|
fix: KingClient 添加日志4
|
2024-06-20 09:21:13 +08:00 |
|
caoqianming
|
1d4239c28a
|
fix: KingClient 添加日志3
|
2024-06-19 18:23:04 +08:00 |
|
caoqianming
|
98d10405e4
|
fix: KingClient 添加日志2
|
2024-06-19 18:13:48 +08:00 |
|
caoqianming
|
c42dafcb44
|
fix: KingClient 添加日志
|
2024-06-19 17:45:11 +08:00 |
|
caoqianming
|
97f8a1e143
|
fix: kingclient set token bug
|
2024-06-19 15:54:45 +08:00 |
|
caoqianming
|
b0dfb020ce
|
fix: 添加亚控通用调用接口 bug2
|
2024-06-19 15:38:26 +08:00 |
|
caoqianming
|
d78c8b10dc
|
fix: 添加亚控通用调用接口 bug
|
2024-06-19 15:35:15 +08:00 |
|
caoqianming
|
7867fe0e67
|
feat: 添加亚控通用调用接口
|
2024-06-19 15:23:40 +08:00 |
|
caoqianming
|
f612c8e662
|
fix: dispath_checkwork_task bug2
|
2024-06-18 17:58:58 +08:00 |
|
caoqianming
|
51e32f24b1
|
fix: dispath_checkwork_task bug
|
2024-06-18 17:55:07 +08:00 |
|
caoqianming
|
de6c57b5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-18 17:54:53 +08:00 |
|
caoqianming
|
1d7babafe7
|
feat: 添加hazard路由
|
2024-06-18 17:54:50 +08:00 |
 zty
|
ab358abf80
|
fix: edu.url edu.view
|
2024-06-12 18:07:17 +08:00 |
|
zty
|
d8f9dbfcfb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-12 10:47:09 +08:00 |
|
zty
|
5f4884e83d
|
fix: edu/model 、serializers、view 删减参与部门
|
2024-06-12 10:46:58 +08:00 |
|
caoqianming
|
5778381189
|
feat: dpm checkwork增加字段2
|
2024-06-12 10:45:29 +08:00 |
|
caoqianming
|
dc5be36e78
|
feat: dpm checkwork增加字段
|
2024-06-12 10:45:12 +08:00 |
|
caoqianming
|
63dbc00a12
|
fix: dispatch_checkwork_task自动添加time_end
|
2024-06-12 10:13:59 +08:00 |
|
caoqianming
|
7f3da29560
|
fix: 注册dpm task
|
2024-06-11 17:11:20 +08:00 |
|
caoqianming
|
e95b7b73bc
|
feat: 注册dpm task
|
2024-06-11 16:38:19 +08:00 |
|
caoqianming
|
f596a6ab1a
|
feat: 注释掉reload_web_git
|
2024-06-11 16:19:46 +08:00 |
|
caoqianming
|
388b28133f
|
fix: checktaskset create bug
|
2024-06-11 16:08:21 +08:00 |
|
caoqianming
|
a9cbd846cd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-11 16:01:02 +08:00 |
|
caoqianming
|
b913928ac6
|
feat: 风险管控表精简
|
2024-06-11 16:01:00 +08:00 |
|
zty
|
423eca445e
|
fix: edu/ExamRecordSerializer
|
2024-06-11 14:17:07 +08:00 |
|
zty
|
f4e003b9f0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
修改edu/examrecord
|
2024-06-11 14:04:39 +08:00 |
|
zty
|
5178cb0daa
|
fix: edu/Examrecord
|
2024-06-11 14:03:58 +08:00 |
|
caoqianming
|
6851dd3f94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-11 11:29:00 +08:00 |
|
caoqianming
|
af879ca01b
|
fix: myschedule 保存时的bug
|
2024-06-11 11:28:58 +08:00 |
|
zty
|
18b0429044
|
fix: edu/submit
|
2024-06-11 09:11:32 +08:00 |
|
zty
|
71e7d4d187
|
feat: base send_mail_task支持发送多人
|
2024-06-07 17:08:50 +08:00 |
|
zty
|
7258d2e0ca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-06-07 16:51:02 +08:00 |
|
zty
|
87311668f5
|
fix: exam attend bulk_create bug
|
2024-06-07 16:50:58 +08:00 |
|
caoqianming
|
c55005994b
|
feat: base myschedule加入url
|
2024-06-07 16:01:16 +08:00 |
|
caoqianming
|
255867b2d3
|
fix: myscheduleserializer 返回字段bug
|
2024-06-07 15:46:37 +08:00 |
|
caoqianming
|
108e40bb3d
|
feat: base 去除MySchedule的权限控制
|
2024-06-07 13:41:35 +08:00 |
|
caoqianming
|
6eccfb67cb
|
feat: 增加riskpoint返回信息
|
2024-06-07 09:50:32 +08:00 |
|
caoqianming
|
fe40facfa2
|
fix: base 对循环引用抛出异常
|
2024-06-07 09:49:17 +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
|
9e0241f209
|
fix: 改变培训级别以与风险点一致
|
2024-06-06 09:13:11 +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 |
|
caoqianming
|
e81cfbe10d
|
fix: month_st 需提前返回
|
2024-05-16 14:18:12 +08:00 |
|
caoqianming
|
9e15b34ed7
|
fix: month_st 需提前返回
|
2024-05-16 13:15:13 +08:00 |
|
caoqianming
|
924c5d09b1
|
fix: 计算month_st时必须有sflog
|
2024-05-16 12:34:26 +08:00 |
|
caoqianming
|
f836def404
|
fix: mpoitstat correct 时除0错误
|
2024-05-16 11:34:06 +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
|
4d65407e39
|
fix: mpoitstat correct 时调用错误
|
2024-05-16 11:21:07 +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
|
e1172c2fcf
|
feat: SfLogExp添加约束及cal_exp_duration_sec优化
|
2024-05-15 12:59:12 +08:00 |
|
caoqianming
|
5a07b6f889
|
fix: set_eq_rs 逻辑缺陷2
|
2024-05-15 11:18:02 +08:00 |
|
caoqianming
|
ff05151ce2
|
fix: set_eq_rs 逻辑缺陷
|
2024-05-15 11:04:47 +08:00 |
|
caoqianming
|
ff4984831e
|
doc: 注释修改
|
2024-05-15 10:41:39 +08:00 |
|
caoqianming
|
3d6adedb8c
|
feat: hour计数改为sec计数 步骤3移除字段
|
2024-05-15 10:40:46 +08:00 |
|
caoqianming
|
b4b3d6eadc
|
feat: hour计数改为sec计数 步骤2
|
2024-05-15 10:31:17 +08:00 |
|
caoqianming
|
8753994468
|
fix: hour计数改为sec计数 make_sflogs 的bug
|
2024-05-15 10:14:57 +08:00 |
|
caoqianming
|
a3f5e48b8c
|
feat: hour计数改为sec计数
|
2024-05-15 10:06:49 +08:00 |
|
caoqianming
|
e6fb2c8c72
|
feat: base 增加is_close函数
|
2024-05-15 08:30:10 +08:00 |
|
caoqianming
|
5aee3282aa
|
fix: set_eq_rs 优先ep_monitored_id
|
2024-05-14 15:45:42 +08:00 |
|
caoqianming
|
6ba99f119a
|
fix: 更新所监测设备测点的total_production筛选条件错误
|
2024-05-14 13:53:23 +08:00 |
|
caoqianming
|
7f1dbda3b0
|
feat: mpointstat增加查询条件
|
2024-05-14 13:26:11 +08:00 |
|
caoqianming
|
3fc8e17266
|
feat: stlog添加约束
|
2024-05-13 23:06:47 +08:00 |
|
caoqianming
|
da444f720d
|
fix: 设备运行状态set_eq_rs先belong后mointored 2
|
2024-05-13 22:33:14 +08:00 |
|
caoqianming
|
c434e94205
|
fix: 设备运行状态set_eq_rs先belong后mointored
|
2024-05-13 22:19:27 +08:00 |
|
caoqianming
|
41370ee971
|
fix: 更新所监测设备测点的total_production的除0问题2
|
2024-05-13 18:25:23 +08:00 |
|
caoqianming
|
c2933a795a
|
fix: 更新所监测设备测点的total_production的除0问题
|
2024-05-13 18:10:34 +08:00 |
|
caoqianming
|
a2ff2c0a2c
|
fix: 去除所有exception只保留zerodi
|
2024-05-13 16:37:39 +08:00 |
|
caoqianming
|
89d9ac84d8
|
fix: ['sum']时要注意none值
|
2024-05-13 16:30:15 +08:00 |
|
caoqianming
|
c68feb4c8b
|
fix: 更新所监测设备测点的total_production
|
2024-05-13 16:08:41 +08:00 |
|
caoqianming
|
52d9407346
|
feat: 班次表增加排序
|
2024-05-13 09:39:15 +08:00 |
|
caoqianming
|
9fe86eeb63
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:35:52 +08:00 |
|
caoqianming
|
77434b0ec8
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:34:02 +08:00 |
|
caoqianming
|
2647992b42
|
feat: envdata增加氨逃逸字段
|
2024-05-11 15:40:50 +08:00 |
|
caoqianming
|
829e0b59f3
|
fix: cal_mpointstat_manual sum 获取bug
|
2024-05-11 12:33:46 +08:00 |
|
caoqianming
|
2c6d586d85
|
fix: 测点更新设备状态修复
|
2024-05-11 11:23:24 +08:00 |
|
caoqianming
|
99ef705529
|
fix: insert_mplogx_from_king_rest_chunk envdata save
|
2024-05-11 11:01:32 +08:00 |
|
caoqianming
|
f6f342e552
|
feat: mpointview增加查询条件
|
2024-05-11 10:18:27 +08:00 |
|
caoqianming
|
69e75cc1d7
|
feat: mpointstat手动录入在create时校验唯一
|
2024-05-10 16:38:42 +08:00 |
|
caoqianming
|
d5b5014bf9
|
fix: cal_mpointstat_manual传参错误
|
2024-05-10 16:25:01 +08:00 |
|
caoqianming
|
978b939ea1
|
feat: cal_mpointstats指定测点的优化
|
2024-05-10 16:11:37 +08:00 |
|
caoqianming
|
20e9ac451a
|
fix: 标煤耗计算修改3
|
2024-05-10 15:51:13 +08:00 |
|
caoqianming
|
489d4bb6e5
|
fix: 标煤耗计算修改2
|
2024-05-10 15:45:58 +08:00 |
|
caoqianming
|
5b4742f181
|
fix: 标煤耗计算修改
|
2024-05-10 15:41:09 +08:00 |
|
caoqianming
|
0e273a35c6
|
fix: 一些调整
|
2024-05-10 13:52:34 +08:00 |
|
caoqianming
|
295a971000
|
fix: ZeroDivisionError 时要把属性值反设为0
|
2024-05-10 13:33:47 +08:00 |
|
caoqianming
|
7c087024c9
|
feat: cal_mpointstats可指定cal_attrs
|
2024-05-10 13:17:02 +08:00 |
|
caoqianming
|
4e4e923476
|
feat: cal_mpointstats支持传入指定测点集
|
2024-05-10 13:04:52 +08:00 |
|
caoqianming
|
10024f0d05
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:15 +08:00 |
|
caoqianming
|
43aa4c83a8
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:05 +08:00 |
|
caoqianming
|
ebccaa2a50
|
feat: customlist替代listmixin
|
2024-05-10 09:13:08 +08:00 |
|
caoqianming
|
ac524778e3
|
feat: base 使用custommodelmixin替代listmodelmixin以定制返回数据
|
2024-05-10 09:11:33 +08:00 |
|
caoqianming
|
a9b2d67302
|
feat: mpointview增加查询条件
|
2024-05-10 08:52:12 +08:00 |
|
caoqianming
|
72e8129619
|
feat: mpointstat增加查询条件
|
2024-05-09 15:22:11 +08:00 |
|
caoqianming
|
bc4bc5b132
|
fix: enm 班统计错误处理
|
2024-05-09 14:41:40 +08:00 |
|
caoqianming
|
186c7ebf7c
|
fix: 清零处理时的逻辑bug
|
2024-05-09 11:37:24 +08:00 |
|
caoqianming
|
d01f12aa3f
|
fix: production_hour 计算错误
|
2024-05-09 10:09:23 +08:00 |
|
caoqianming
|
972b460a9f
|
feat: cal_mpointstat增加cal_exp_duration_hour 的前置处理
|
2024-05-08 16:34:25 +08:00 |
|
caoqianming
|
2e67f7c468
|
fix: cal_exp_duration_hour 默认一个参数值
|
2024-05-08 16:32:00 +08:00 |
|
caoqianming
|
b22058d0bb
|
feat: cal_exp_duration_hour 添加参数以做测试
|
2024-05-08 16:07:03 +08:00 |
|
caoqianming
|
035b9b392a
|
fix: get_pcoal_heat 时以work_date为准
|
2024-05-08 16:06:08 +08:00 |
|
caoqianming
|
757c3f4ad8
|
fix: get_total_hour_now_and_shut_hour查询条件用work_date替换
|
2024-05-08 15:58:08 +08:00 |
|
caoqianming
|
30974d90b0
|
feat: 移除mgroups_allocate字段
|
2024-05-08 12:09:21 +08:00 |
|
caoqianming
|
895b8c1810
|
fix: mpointcache set时更新设备状态的优化
|
2024-05-08 09:11:42 +08:00 |