Commit Graph

27 Commits (db1586eff98556a896a2ea9dbfcc4449010802fa)

Author SHA1 Message Date
guoyuepeng db1586eff9 Merge remote-tracking branch 'origin/dev' into dev 2024-09-14 09:41:55 +08:00
water_xu 41d7b44c00 Merge branch 'pet' into dev 2024-09-13 18:27:59 +08:00
LiuJiaNan 76a6aad1b4 地图四色图和便捷单独控制是否显示 2024-09-13 17:56:35 +08:00
guoyuepeng a8128a0e56 1.移植门口门禁系统和
2.升级js
3.还原安全环保检查
2024-09-11 17:35:16 +08:00
liujun 7662675179 就公司人员定位系统功能更新 2024-09-05 10:19:49 +08:00
liujun 2e1358661a 人员定位bug修复 2024-05-22 15:19:10 +08:00
liujun c9bf16eb53 九公司定位系统配置文件更新 2024-05-20 13:51:32 +08:00
limingyu 62ad6f1b75 Merge branch 'limingyu-20240423-消防安全管理标点' into pet 2024-05-07 13:45:52 +08:00
limingyu 4562798120 重点工程摄像头点位显示是否在线 2024-05-07 13:37:59 +08:00
limingyu a436221309 Merge branch 'pet' into limingyu-20240428-气象监测地图 2024-04-29 14:08:45 +08:00
limingyu de3482be03 地图右边栏新增气象监测按钮页面 2024-04-29 11:44:47 +08:00
liujun 123fca5eda 已审核企业信息查看变成绿色 2024-04-25 09:55:35 +08:00
liujun 674b93b811 Merge remote-tracking branch 'origin/pet' into dev 2024-04-24 18:37:46 +08:00
guoyuepeng 05a8219cf7 Merge remote-tracking branch 'origin/pet' into pet 2024-04-24 18:32:25 +08:00
liujun c1fa9e1be0 Merge remote-tracking branch 'origin/pet' into dev
# Conflicts:
#	src/views/map/index.vue
2024-04-24 17:35:08 +08:00
liujun 0fba5ebca5 1、更换地图图标 2024-04-24 14:23:07 +08:00
liujun 1862bc1eea 同步时未异步bug修复 2024-04-24 14:02:36 +08:00
guoyuepeng 77ffeafcdf Merge remote-tracking branch 'origin/pet' into pet 2024-04-23 14:51:46 +08:00
guoyuepeng 513997d923 1.企业端地图图层问题修复。轨迹和聚合点图层上移 2024-04-23 14:39:25 +08:00
liujun 8ea1cb9a2c 一公司人员定位功能接口对接功能 2024-04-23 14:36:31 +08:00
liujun 397f5e0e49 Merge remote-tracking branch 'origin/pet' into dev 2024-04-19 16:56:08 +08:00
LiuJiaNan c912472911 人员轨迹、报警信息 2024-04-16 16:25:19 +08:00
guoyuepeng 192a354c4f 1.消防模块地图修改 2024-04-13 18:04:36 +08:00
liujun 18e67398ec 一公司人员定位无数据bug修复 2024-03-28 10:30:08 +08:00
liujun 9adaee5a09 一公司人员定位系统没有人员信息bug修复 2024-03-26 10:14:35 +08:00
liujun e8cbeaf287 消防资源统计功能模块 2024-01-17 09:10:54 +08:00
liujun 993e215991 相关方端bug 2024-01-02 14:12:39 +08:00