Commit Graph

2007 Commits

Author SHA1 Message Date
caoqianming ac7e0a84ea feat: pm 添加工时字段 2024-06-21 15:48:14 +08:00
caoqianming 2bb860f8dd feat: 添加工时字段 2024-06-21 14:31:31 +08:00
caoqianming 5efd9888dd feat: 交接记录提交只要是同部门的就可以2 2024-06-21 13:27:47 +08:00
caoqianming 7c0df5f804 fix: raise 工艺路线未配置 2024-06-21 11:15:35 +08:00
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 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