Commit Graph

420 Commits (edc013140f0daff181eac7f2e8b5f79124b5fd1d)

Author SHA1 Message Date
chenxinying d7cccbed87 行车三检检查日志 2024-03-22 17:29:59 +08:00
WenShiJun 037e723d71 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:18:20 +08:00
WenShiJun cd5110f5c5 年检管理,保险管理优化 2024-03-22 17:18:08 +08:00
鲁洪霞 7ed209f82a Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 16:47:40 +08:00
chenxinying 55677507ac 行车三检承诺问询,排查类别检查项 2024-03-22 15:08:24 +08:00
鲁洪霞 7b110927c4 2024-03-22 15:02:41 +08:00
wangpeng 3213c25bc1 从业人员管理 2024-03-22 14:59:41 +08:00
WenShiJun 6c66a00624 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 14:36:07 +08:00
WenShiJun deaa659d2b 运单登记,地点管理,客户管理模块优化 2024-03-22 14:35:55 +08:00
zhangyanli 4663e598b2 档案管理和效果评估 2024-03-21 16:22:25 +08:00
LiuJiaNan f6e8a66857 班级管理/课程 2024-03-21 16:21:13 +08:00
LiuJiaNan 82f7c1709b dialog的:on-close换成@close 2024-03-21 11:49:21 +08:00
LiuJiaNan ea9800791a 班级管理/课程 2024-03-20 17:46:54 +08:00
chenxinying e803f8bf41 行车三检承诺问询,排查类别检查项 2024-03-20 17:04:34 +08:00
WenShiJun 02a0c7fcae Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/enterprise_management/department/components/add.vue
2024-03-20 16:58:48 +08:00
WenShiJun f4606dfdde 安全生产月活动,安全知识手册模块开发
运单登记,地点管理模块优化,
2024-03-20 16:58:12 +08:00
LiuJiaNan 80f0ffbbe1 element新版本api弃用警告 2024-03-20 15:45:42 +08:00
zhangyanli 1ffbba0de9 档案管理和效果评估 2024-03-20 10:02:16 +08:00
LiuJiaNan 8156e84bff axios 2024-03-20 08:31:26 +08:00
LiuJiaNan 3bb1832d68 班级管理/学员 2024-03-19 18:00:48 +08:00
LiuJiaNan 39ccafdc17 班级管理/学员 2024-03-19 17:43:42 +08:00
LiuJiaNan 6699355494 班级管理/学员 2024-03-19 16:17:08 +08:00
xiepeng abafba83fb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/assigned_manage/add.vue
2024-03-19 14:08:38 +08:00
xiepeng 6419d6c50c 过户管理
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
2024-03-19 14:04:17 +08:00
LiuJiaNan 54916b2756 element新版本dialog样式问题 2024-03-19 13:54:13 +08:00
LiuJiaNan fa41f42465 班级管理 2024-03-18 18:01:48 +08:00
LiuJiaNan f0c4ec11bb 试卷管理 2024-03-15 17:59:16 +08:00
LiuJiaNan ab93425d83 试卷管理 2024-03-15 17:56:45 +08:00
WenShiJun 375021971d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/constant.js
#	src/views/safety_production_related/things_check/index.vue
2024-03-15 17:55:34 +08:00
WenShiJun 9472c26770 生产安全事故档案模块开发 2024-03-15 17:54:28 +08:00
277151821@qq.com 5d9aba7426 删除console 2024-03-15 15:57:47 +08:00
277151821@qq.com a411f039ab 运营管理 2024-03-15 11:13:20 +08:00
277151821@qq.com 290a7a0d4c 维保管理 2024-03-15 11:12:49 +08:00
277151821@qq.com 98f433b37e 保险管理 2024-03-15 11:12:14 +08:00
277151821@qq.com 93e40741ad 北斗管理 2024-03-15 11:11:12 +08:00
zhangyanli da60a2c7c8 教培档案管理 2024-03-15 10:01:08 +08:00
LiuJiaNan a6a2fbc88b 视频播放增加去掉倍速和进度条 2024-03-15 09:23:39 +08:00
LiuJiaNan 2efc75601a 教育培训 2024-03-15 08:32:31 +08:00
LiuJiaNan 4a5dcf8b1f 教育培训 2024-03-15 08:19:56 +08:00
LiuJiaNan 1ad0b76160 删除console和禁止使用Object.assign 2024-03-14 10:46:49 +08:00
xiepeng c28033032f Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:03:33 +08:00
xiepeng 5e3468343a 过户管理 报废管理 2024-03-14 09:03:11 +08:00
WenShiJun 3ec021ff30 Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 18:06:07 +08:00
WenShiJun 68a22f3702 岗位安全承诺书、责任书,职业危害告知书,管理人员配备,安全生产目标,安全责任制考核模块开发,优化 2024-03-13 18:05:42 +08:00
LiuJiaNan 566eee266e 教育培训 2024-03-13 13:47:04 +08:00
zhangyanli f570e9dcc6 用户管理和企业管理修改 2024-03-12 09:15:23 +08:00
WenShiJun 3db91701d0 安全例会优化
岗位安全承诺书开发
岗位安全责任书开发
2024-03-11 18:09:41 +08:00
WenShiJun a1c8e248d6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:06:25 +08:00
WenShiJun 4f57a393b1 新增劳务聘用合同,岗位安全责任书,职业危害告知书
安全例会优化
2024-03-08 18:06:21 +08:00
xiepeng f9bf755912 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:46:51 +08:00