WenShiJun
|
c52adbb7f9
|
安全例会未开始或已结束仍可进入问题优化
|
2024-03-29 14:23:32 +08:00 |
|
WenShiJun
|
cde8497a62
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-29 14:17:03 +08:00 |
|
WenShiJun
|
0a0263cd1e
|
安全例会当前登录用户只能查看自己可参与的会议优化
|
2024-03-29 14:16:58 +08:00 |
 zhangyanli
|
dec7e09622
|
教培功能bug修复
|
2024-03-27 15:54:26 +08:00 |
 LiuJiaNan
|
9d4435e6b5
|
人员信息
|
2024-03-26 09:52:10 +08:00 |
 wangpeng
|
968d04c22f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pages/basics/home.vue
|
2024-03-25 19:24:09 +08:00 |
|
wangpeng
|
59ebc64921
|
清理测试信息
|
2024-03-25 19:17:10 +08:00 |
|
LiuJiaNan
|
4f1f2f3b62
|
学习园地
|
2024-03-25 19:16:41 +08:00 |
chenxinying
|
5c298c2e41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 17:43:19 +08:00 |
|
chenxinying
|
c0fc40cb94
|
行车三检带水印实时拍照
|
2024-03-22 17:43:13 +08:00 |
|
WenShiJun
|
a978688811
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 17:16:20 +08:00 |
|
WenShiJun
|
adb2ba0ab2
|
安全例会优化->实时照片水印添加当前时间
|
2024-03-22 17:16:00 +08:00 |
|
chenxinying
|
a7cf3c1a10
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 15:09:50 +08:00 |
|
chenxinying
|
32efb53c27
|
行车三检
|
2024-03-22 15:09:31 +08:00 |
|
wangpeng
|
9e7b0b5420
|
从业人员管理
|
2024-03-22 15:08:55 +08:00 |
|
WenShiJun
|
081d0dab1d
|
安全例会优化->实时照片添加水印，实时照片和签字图片上传优化
|
2024-03-11 18:08:35 +08:00 |
|
WenShiJun
|
5be53f55b0
|
安全例会优化
|
2024-03-08 18:08:39 +08:00 |
|
WenShiJun
|
869c0a6cda
|
安全例会模块开发->参会人员上传证明
|
2024-03-06 16:11:38 +08:00 |
|
WenShiJun
|
44dd6ba00b
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pages/basics/home.vue
|
2024-03-05 18:15:17 +08:00 |
|
WenShiJun
|
0f75d87d73
|
安全例会模块开发
|
2024-03-05 18:13:32 +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 |
|
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 |
|
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 |
|
zhangqihang
|
3b7499eb40
|
修复bug
|
2024-02-28 09:02:47 +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
|
c1515f1b4f
|
首页新增安全例会按钮
|
2024-02-20 11:21:37 +08:00 |
|
chenxinying
|
3ee7af3002
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# .gitignore
|
2024-02-20 10:40:13 +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 |
|
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 |
|
wangpeng
|
3984573dee
|
风险管控排查问题修复
|
2024-02-19 09:51:26 +08:00 |
|
WenShiJun
|
4e6a308437
|
数据暂存
|
2024-02-06 15:39:22 +08:00 |
|
WenShiJun
|
33c431d34f
|
安全环保检查模块优化0206
|
2024-02-06 15:38:56 +08:00 |
|
chenxinying
|
8a5a4b29f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-05 15:37:22 +08:00 |
|
chenxinying
|
c436c4ac5d
|
受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批
|
2024-02-05 15:37:11 +08:00 |
|
wangpeng
|
a73f58891a
|
首页统计待排查页面跳转新增
|
2024-02-05 09:05:12 +08:00 |
|
zhangqihang
|
01a12469b4
|
重点工程
|
2024-02-03 18:00:44 +08:00 |
|
wangpeng
|
381de3b66d
|
隐患(已验收)
|
2024-02-03 16:18:00 +08:00 |
|
wangpeng
|
4bf6b7876d
|
隐患(待整改、超期、验收)
|
2024-02-03 15:36:05 +08:00 |
|
wangpeng
|
524097e365
|
隐患记录
|
2024-02-03 12:27:03 +08:00 |
|
wangpeng
|
9b12285d73
|
隐患清单检查+检查结果
|
2024-02-03 09:32:20 +08:00 |
|
chenxinying
|
daca12f37c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-01 09:02:03 +08:00 |
|
chenxinying
|
79447571e8
|
受限空间和高处作业
|
2024-02-01 09:01:50 +08:00 |
|
dearlin
|
045294b52c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-31 17:21:05 +08:00 |
|
dearlin
|
552f5449ab
|
辨别部位里电子围栏名称字段修改
|
2024-01-31 17:20:58 +08:00 |
|
chenxinying
|
a14c542742
|
电子围栏显示，多人签字更改
|
2024-01-31 15:14:01 +08:00 |
|
chenxinying
|
282c948a7d
|
动火作业
|
2024-01-26 11:03:47 +08:00 |
|
chenxinying
|
b692cf9a6d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-25 17:40:08 +08:00 |
|
chenxinying
|
7288ed869b
|
如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业
|
2024-01-25 17:39:35 +08:00 |
|
dearlin
|
97a2372357
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-25 17:29:50 +08:00 |
|
dearlin
|
ca7db13c77
|
手机端排查清单需在电子围栏中
|
2024-01-25 17:29:41 +08:00 |
|
fangjiakai
|
2a84c69ea0
|
动火添加绑定电子围栏
|
2024-01-25 15:59:40 +08:00 |
|
chenxinying
|
5e7217a392
|
八项作业动火作业签字显示完成，动火人及证书编号显示完成
|
2024-01-25 13:47:26 +08:00 |
|
fangjiakai
|
841fc02538
|
动火流程图
|
2024-01-25 13:36:15 +08:00 |
|
fangjiakai
|
e5d97b6027
|
动火安全措施回显
|
2024-01-25 10:07:24 +08:00 |
|
fangjiakai
|
d539e7d54c
|
动火详情组件
|
2024-01-25 08:32:09 +08:00 |
|
fangjiakai
|
63f2bbd9f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-24 17:50:34 +08:00 |
|
fangjiakai
|
c447d37a4e
|
动火列表状态
|
2024-01-24 17:50:25 +08:00 |
|
chenxinying
|
c38168173e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-24 17:27:58 +08:00 |
|
chenxinying
|
8ab22cc85c
|
八项作业特级，一级，二级动火流程打回
|
2024-01-24 17:27:42 +08:00 |
|
fangjiakai
|
81dcd9329a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
|
2024-01-24 17:24:23 +08:00 |
|
fangjiakai
|
63b5d07ef6
|
动火安全措施回显
|
2024-01-24 17:23:22 +08:00 |
|
chenxinying
|
b57bee505c
|
八项作业特级，一级，二级动火流程打回
|
2024-01-24 17:15:20 +08:00 |
|
fangjiakai
|
589716c05d
|
动火安全措施确认
|
2024-01-24 14:03:35 +08:00 |
|
chenxinying
|
8a57daafec
|
八项作业特级，一级，二级动火流程通过
|
2024-01-24 13:58:55 +08:00 |
|
LiuJiaNan
|
55cbea71d8
|
公共页面
|
2024-01-24 09:24:23 +08:00 |
|
LiuJiaNan
|
b9e79b7a4f
|
公共页面
|
2024-01-24 09:23:55 +08:00 |
|
chenxinying
|
3bb1f384f6
|
八项作业特级动火list提交
|
2024-01-24 08:47:58 +08:00 |
|
fangjiakai
|
61c8715476
|
动火设置安全措施确认人
|
2024-01-23 14:03:07 +08:00 |
|
chenxinying
|
cef4bc7d0d
|
八项作业动火监护人签字
|
2024-01-23 11:28:19 +08:00 |
|
chenxinying
|
8d588f6d08
|
八项作业安全措施确认人
|
2024-01-23 08:30:59 +08:00 |
|
chenxinying
|
9a00ecd8ed
|
八项作业气体检测分析
|
2024-01-22 17:29:29 +08:00 |