Commit Graph

102 Commits (fed09e1677f1edbd09273caa7b3bbfbeb31174ef)

Author SHA1 Message Date
wangpeng fed09e1677 更新忽略文件 2024-03-04 10:43:42 +08:00
wangpeng d965cadb04 还原配置 2024-03-04 10:41:39 +08:00
wangpeng 6250ce0ba4 Merge pull request 'dev' (#5) from integrated_whb/UniApp_integrated_whb:dev into dev
Reviewed-on: #5
2024-03-04 10:37:48 +08:00
wangpeng 7e7cf1b9c0 还原配置 2024-03-04 10:30:16 +08:00
chenxinying d5129650de 特殊作业作业人显示 2024-03-01 17:53:14 +08:00
fangjiakai 29a9391bb7 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 08:19:33 +08:00
fangjiakai 82f0aa3233 隐患样式 2024-03-01 08:19:27 +08:00
zhangqihang 40f23cf6c3 修复bug 2024-02-29 15:44:14 +08:00
chenxinying dc33f7c9e1 特殊作业选择安全确实确认人 2024-02-29 11:22:06 +08:00
LiuJiaNan c88c0719a4 安全措施选择 2024-02-29 08:59:44 +08:00
chenxinying a53064ece7 盲板作业 2024-02-29 08:45:24 +08:00
chenxinying e8ee4b5d24 Merge remote-tracking branch 'origin/dev' into dev 2024-02-29 08:43:58 +08:00
WenShiJun c36e88fba1 安全通知能能修改->企业公告,通知公告部分 2024-02-28 19:33:03 +08:00
dearlin dd71531980 14132 这几种隐患来源的显示不正确 需要统一 2024-02-28 14:25:43 +08:00
zhangqihang 426c561104 修复bug 2024-02-28 13:45:58 +08:00
chenxinying bed3447618 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 09:06:06 +08:00
zhangqihang 3b7499eb40 修复bug 2024-02-28 09:02:47 +08:00
chenxinying 8874ffc885 盲板作业 2024-02-27 14:37:29 +08:00
chenxinying e8e46bd741 动土作业,盲板作业,断路作业 2024-02-27 14:35:43 +08:00
fangjiakai 7d50f2c207 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages/application/eight-assignments.vue
2024-02-27 14:15:30 +08:00
fangjiakai b1265f9468 更换高危作业顺序 2024-02-27 14:14:33 +08:00
zhangqihang 0b14658005 修复bug 2024-02-26 15:33:05 +08:00
zhangqihang b9d6f2b2d1 修复bug 2024-02-23 18:02:51 +08:00
zhangqihang 8a9707e924 修复bug 2024-02-23 09:07:59 +08:00
chenxinying c3cb02c9c4 临时用电和部分动土作业 2024-02-22 11:39:41 +08:00
zhangqihang 266c860d7d 安全环保检查bug修复 2024-02-22 11:36:18 +08:00
fangjiakai 35bcb78b59 八项作业流程图 2024-02-21 10:49:36 +08:00
fangjiakai 5052eba52a Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 17:03:46 +08:00
fangjiakai 8ebd1c2deb 修改流程图 2024-02-20 17:03:36 +08:00
dearlin 3b0b016db1 新增安全例会签字不好使 2024-02-20 16:10:38 +08:00
dearlin e67e07c510 新增安全例会功能补充 2024-02-20 15:44:11 +08:00
wangpeng 2048d90bc3 隐患清单排查漏传检查项目参数 2024-02-20 15:42:54 +08:00
zhangqihang 6023210542 重点工程流程修改 2024-02-20 15:15:01 +08:00
fangjiakai 4fec2fad40 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 14:20:19 +08:00
fangjiakai a9217ee2c0 修改流程图 2024-02-20 14:18:59 +08:00
fangjiakai bfdb4ab1ec 删除隐患确认人 2024-02-20 11:40:42 +08:00
dearlin 7a488c9dc3 首页新增安全例会按钮缺少的图片 2024-02-20 11:22:16 +08:00
dearlin c1515f1b4f 首页新增安全例会按钮 2024-02-20 11:21:37 +08:00
chenxinying 0a0cfb6df3 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 10:45:59 +08:00
wangpeng 32aa9fe63c 移除非工作目录 2024-02-20 10:45:07 +08:00
chenxinying 3ee7af3002 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.gitignore
2024-02-20 10:40:13 +08:00
chenxinying 455c9b25b2 临时用电 2024-02-20 10:40:01 +08:00
chenxinying 564091e81d 临时用电 2024-02-20 10:36:03 +08:00
chenxinying ae27ff75bc 受限空间和高处作业,动火作业验收视频 2024-02-20 10:25:50 +08:00
wangpeng 9185eb3917 隐患排查覆盖问题处理 2024-02-20 00:42:47 +08:00
wangpeng e00f386f42 风险管控排查问题修复 2024-02-19 23:28:44 +08:00
fangjiakai 2c5a77582c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.gitignore
2024-02-19 16:10:23 +08:00
fangjiakai 4e856af6c3 git忽略文件 2024-02-19 16:10:11 +08:00
WenShiJun ea5511557e 首页安全环保检查模块优化 2024-02-19 12:05:08 +08:00
wangpeng f80b00bd8c Merge remote-tracking branch 'origin/dev' into dev 2024-02-19 09:59:43 +08:00