 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
|
644b805ea1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 15:27:34 +08:00 |
|
wangpeng
|
a869f32c8e
|
从业人员管理
|
2024-03-22 15:26:43 +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
|
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 |