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

522 Commits (bad300b152bbc824602506af8b3c26427900479d)

Author SHA1 Message Date
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 327a999598 撤回本地启动配置 2024-03-07 09:38:16 +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 0821bb98bd 人员移动增加楼层显示,解决中定点偏移,替换地图JS 2024-03-01 12:04:59 +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
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
LiuJiaNan 0167dfcd75 人员报警增加动画 2024-03-01 09:53:41 +08:00
dearlin 0f14838296 八项作业与部分bug 2024-03-01 09:05:21 +08:00
WenShiJun 2a719a791e 客户管理模块->新增列表，添加页面功能 
地点管理模块->新增列表，添加页面功能
 2024-02-29 18:28:57 +08:00