Commit Graph

108 Commits (6c66a006249d0c9f8a004f3f5c6a99a42302935d)

Author SHA1 Message Date
zhangyanli 4663e598b2 档案管理和效果评估 2024-03-21 16:22:25 +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 fa41f42465 班级管理 2024-03-18 18:01:48 +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 93e40741ad 北斗管理 2024-03-15 11:11:12 +08:00
LiuJiaNan 566eee266e 教育培训 2024-03-13 13:47:04 +08:00
zhangyanli f570e9dcc6 用户管理和企业管理修改 2024-03-12 09:15:23 +08:00
WenShiJun a1c8e248d6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:06:25 +08:00
xiepeng f9bf755912 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:46:51 +08:00
xiepeng 2c7b50cc36 过户管理 2024-03-08 17:45:29 +08:00
277151821@qq.com c0944ad180 年检管理 2024-03-08 08:39:12 +08:00
WenShiJun 908f306f80 Merge remote-tracking branch 'origin/dev' into dev 2024-03-07 13:23:39 +08:00
xiepeng 09e9820603 运营车辆 修改 车船税 2024-03-07 10:26:07 +08:00
LiuJiaNan 33626cab78 删除没用的代码 2024-03-07 10:02:37 +08:00
LiuJiaNan 01cbe545c4 删除没用的代码 2024-03-07 10:00:45 +08:00
277151821@qq.com 3a54b4ffdf 货运挂车 2024-03-07 09:33:21 +08:00
xiepeng 4b724f5560 运营车辆 2024-03-06 09:26:27 +08:00
WenShiJun fa170fe4d0 Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 11:57:44 +08:00
WenShiJun 42e79f21be 功能优化 2024-03-04 11:57:38 +08:00
wangpeng bd44a63496 代码合并后当前项目配置信息修改 2024-03-04 11:32:03 +08:00
wangpeng e7f2af2492 Merge pull request 'dev' (#3) from integrated_whb/integrated_whb_vue:dev into dev
Reviewed-on: #3
2024-03-04 11:20:53 +08:00
wangpeng 3a29de3267 临时修改,代码合并完后再改回 2024-03-04 11:19:52 +08:00
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +08:00
WenShiJun c2c9d83777 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 14:37:48 +08:00
xiepeng 845c162aad 运营车辆 2024-03-01 14:32:47 +08:00
WenShiJun 4376e3a942 安全通知,运单登记,客户管理,地点管理功能优化 2024-03-01 13:53:42 +08:00
xiepeng 62597aa135 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.env
2024-03-01 10:27:32 +08:00
xiepeng b3dd58b4ce 运营车辆 2024-03-01 10:27:00 +08:00
WenShiJun 2a719a791e 客户管理模块->新增列表,添加页面功能
地点管理模块->新增列表,添加页面功能
2024-02-29 18:28:57 +08:00
chenxinying 3915c76463 Merge remote-tracking branch 'origin/dev' into dev 2024-02-29 08:47:15 +08:00
chenxinying 305800c71a PC端八项作业 2024-02-29 08:46:56 +08:00
dearlin a350dc1b26 14328 地图BI页显示优化建议:1.特殊作业图标修改优化例如动火是红色火苗依次类推 2.显示作业添加特殊作业简称 2024-02-28 17:14:37 +08:00
wangpeng 348f673286 Merge pull request 'dev' (#1) from integrated_whb/integrated_whb_vue:dev into dev
Reviewed-on: #1
2024-02-27 14:21:32 +08:00
LiuJiaNan 57c0b9a589 bug14199 2024-02-27 09:27:50 +08:00
wangpeng d3be2a8f2a 更换系统主菜单 2024-02-22 16:18:58 +08:00
dearlin 4a5bd7df58 人员卡管理 2024-02-22 09:16:01 +08:00
dearlin 287201927d 人员定位菜单 2024-02-21 10:41:40 +08:00
zhangyanli b6bc893c88 隐患排查bug修复 2024-02-20 17:25:15 +08:00
dearlin 4a84899838 安全例会,14082bug 2024-02-20 08:39:01 +08:00
zhangyanli 91f0d30d74 删除清单管理bug修复 2024-02-05 16:22:46 +08:00
zhangyanli 76af1d175e 隐患排查清单管理 2024-02-04 14:02:30 +08:00
LiuJiaNan 55a5470adc init 2024-02-04 13:50:28 +08:00
zhangyanli c950b86ceb 路由 2024-02-04 09:00:23 +08:00
LiuJiaNan eb43ac1e95 init 2024-02-03 18:00:44 +08:00
zhangqihang baca47e4cf 重点工程 2024-02-03 17:56:17 +08:00
chenxinying 8c7cb413fe 八项作业受限空间和高处作业PC端显示 2024-02-03 08:46:43 +08:00