wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity
430 Commits
2 Branches
0 Tags
23 MiB
Commit Graph

421 Commits (ae3cba5fb87723b710ce3bb8f0286401dfefaf45)

Author SHA1 Message Date
xiepeng 0e10930e28 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:17:49 +08:00
wangpeng 097433eaf4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 09:41:59 +08:00
zhangyanli 5e1b790772 教培建班 2024-03-25 09:37:38 +08:00
wangpeng b098bf7dcd 部署异常修复 2024-03-25 09:27:54 +08:00
鲁洪霞 9684793f2d 鲁 2024-03-25 09:22:27 +08:00
LiuJiaNan 6df0f3f247 企业用户管理、档案管理、效果评估 2024-03-25 09:13:10 +08:00
xiepeng 8a90839b14 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/constant.js
#	src/request/assigned_manage.js
#	src/request/enterprise_management.js
#	src/request/operation_vehicle.js
#	src/request/scrap_manage.js
#	src/request/taxation_manage.js
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/scrap_manage/add.vue
#	src/views/mechanical_files/taxation_manage/add.vue
#	src/views/mechanical_files/taxation_manage/edit.vue
 2024-03-25 08:52:36 +08:00
xiepeng 70f430b6b6 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:47:41 +08:00
chenxinying 2d1eb54c60 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:43:42 +08:00
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
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
LiuJiaNan 0b7f1f65df 环境变量增加提示 2024-03-07 09:59:58 +08:00
277151821@qq.com 3a54b4ffdf 货运挂车 2024-03-07 09:33:21 +08:00
WenShiJun a3b0cded3f 安全例会模块优化->参会人员页，详情页 2024-03-06 16:11:13 +08:00
277151821@qq.com 3accb1e683 货运挂车 增加校验 2024-03-06 12:02:19 +08:00
xiepeng 4b724f5560 运营车辆 2024-03-06 09:26:27 +08:00
WenShiJun 043e071b64 安全例会模块优化 2024-03-05 18:13:53 +08:00
277151821@qq.com 0bd143e47d 货运挂车 2024-03-05 11:00:34 +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
xiepeng cb7561603b Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 09:32:27 +08:00
xiepeng a9ee3e6942 运营车辆 2024-03-04 09:31:17 +08:00
鲁洪霞 94feeeb9bf 样式修改 2024-03-04 09:05:22 +08:00
LiuJiaNan 89c446c291 BI页 2024-03-04 08:30:58 +08:00
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +08:00
LiuJiaNan df1dcef265 实时追踪 2024-03-01 17:58:20 +08:00
LiuJiaNan b7727b0f5e 实时追踪 2024-03-01 17:51:02 +08:00
fangjiakai 3ad5910d14 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/BI/js/trajectory.js
 2024-03-01 17:14:34 +08:00
LiuJiaNan b6ba08a005 人员定位区域人员统计增加自动滚动 2024-03-01 16:26:47 +08:00
fangjiakai 5fef270f7e 人员实时追踪 2024-03-01 16:21:19 +08:00
LiuJiaNan ece4403288 人员定位区域人员统计增加自动滚动 2024-03-01 15:49:32 +08:00
dearlin cf1c3bbc13 告警类型统计与 区域人员统计 2024-03-01 15:34:00 +08:00
dearlin 7145e51ebb 告警类型统计与 区域人员统计 2024-03-01 15:08:30 +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
LiuJiaNan 481750be3f 更改历史轨迹组件引入位置 2024-03-01 13:52:31 +08:00
fangjiakai 75c44cf1ef Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 12:05:07 +08:00
fangjiakai 5cd0408124 人员移动增加楼层显示,解决中定点偏移 2024-03-01 12:03:28 +08:00
dearlin 7da60f0fbb 八项作业扎点与弹窗 2024-03-01 11:38:49 +08:00
LiuJiaNan 3aef4d21fe 修改电子围栏添加样式 2024-03-01 10:53:50 +08:00
LiuJiaNan 09618493c1 修复关系图警告、电子围栏和组织机构共用一个关系图组件 2024-03-01 10:49:18 +08:00
LiuJiaNan cfd0f1ae63 bug：14355、14342、14333 2024-03-01 10:37:52 +08:00