 liujun
|
bacfc976a6
|
连续点击后无法显示bug修复
|
2024-04-25 14:50:40 +08:00 |
|
liujun
|
123fca5eda
|
已审核企业信息查看变成绿色
|
2024-04-25 09:55:35 +08:00 |
limingyu
|
b860054d04
|
Merge branch 'dev' into limingyu-20240416-一公司动火作业地图
|
2024-04-25 09:27:59 +08:00 |
|
liujun
|
11d828c2ca
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-25 09:18:04 +08:00 |
|
liujun
|
6a869fcad9
|
人员定位数据结构变更
|
2024-04-25 09:17:41 +08:00 |
|
limingyu
|
a264207157
|
消防泵房、消防点位、重点工程、重点工程摄像头样式修改
|
2024-04-24 18:44:39 +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
|
dccc44e644
|
1、监管端、企业端地图信息更新
|
2024-04-24 17:20:05 +08:00 |
|
limingyu
|
7f20f44bca
|
一公司危险作业点位详情样式
|
2024-04-24 17:18:03 +08:00 |
|
limingyu
|
e28c9cc59c
|
一公司地图门口门禁详情样式问题、摄像头点位样式问题、气象站定时器时间改为90秒
|
2024-04-24 17:17:54 +08:00 |
|
liujun
|
0fba5ebca5
|
1、更换地图图标
|
2024-04-24 14:23:07 +08:00 |
|
liujun
|
1862bc1eea
|
同步时未异步bug修复
|
2024-04-24 14:02:36 +08:00 |
|
liujun
|
6b3fa0a96d
|
异步功能新增配置
|
2024-04-23 19:24:32 +08:00 |
|
liujun
|
8455ef8231
|
地图新增信息
|
2024-04-23 18:53:02 +08:00 |
|
limingyu
|
153e4a996b
|
一公司危险作业点位详情样式
|
2024-04-23 15:58:34 +08:00 |
|
limingyu
|
bae82c6352
|
消防点位维护列表新增是否标点字段及是否标点过滤条件
|
2024-04-23 15:22:02 +08:00 |
|
limingyu
|
253660e63e
|
Merge branch 'dev' into limingyu-20240416-一公司动火作业地图
|
2024-04-23 15:12:59 +08:00 |
|
guoyuepeng
|
77ffeafcdf
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-23 14:51:46 +08:00 |
|
limingyu
|
ce2eb5d692
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-23 14:50:00 +08:00 |
|
limingyu
|
b937d07355
|
一公司地图门口门禁详情样式问题、摄像头点位样式问题、气象站定时器时间改为90秒
|
2024-04-23 14:49:47 +08:00 |
|
guoyuepeng
|
513997d923
|
1.企业端地图图层问题修复。轨迹和聚合点图层上移
|
2024-04-23 14:39:25 +08:00 |
|
liujun
|
8ea1cb9a2c
|
一公司人员定位功能接口对接功能
|
2024-04-23 14:36:31 +08:00 |
|
liujun
|
e92316822a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-23 11:09:25 +08:00 |
|
liujun
|
caa0c1943d
|
企业端地图展示详情样式更改
|
2024-04-23 11:09:09 +08:00 |
|
limingyu
|
73a8f5019e
|
Merge branch 'dev' into limingyu-20240416-一公司动火作业地图
|
2024-04-23 09:16:27 +08:00 |
|
limingyu
|
94b6fe747e
|
一公司动火作业与一公司app同步
|
2024-04-22 17:45:34 +08:00 |
water_xu
|
d67da275d3
|
Merge branch 'dev' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into dev
|
2024-04-22 17:38:38 +08:00 |
|
water_xu
|
12dc2f87e7
|
增加了安全承诺书查询时的日期范围查询功能
|
2024-04-22 17:37:11 +08:00 |
|
liujun
|
397f5e0e49
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-04-19 16:56:08 +08:00 |
|
liujun
|
91df5a5593
|
15179 调整一下排版 调整为一行
|
2024-04-18 17:03:14 +08:00 |
|
liujun
|
f667d9e206
|
一公司人员定位bug修复。
|
2024-04-17 18:31:54 +08:00 |
|
liujun
|
8a9fa7a548
|
Merge remote-tracking branch 'origin/liujun-2024-04-12-一公司人员定位' into pet
|
2024-04-17 18:16:54 +08:00 |
|
liujun
|
6e69b96762
|
bug修复-连点bug修复
|
2024-04-17 17:58:27 +08:00 |
|
liujun
|
c6f5cdeb98
|
一公司地图bug修复
|
2024-04-17 14:22:05 +08:00 |
|
liujun
|
d62d563bc9
|
一公司企业端地图功能同步
|
2024-04-17 11:21:45 +08:00 |
|
liujun
|
06672de43b
|
一公司人员定位地图功能完善
|
2024-04-17 08:57:43 +08:00 |
|
liujun
|
f50fdae435
|
一公司人员定位地图功能完善
|
2024-04-16 17:22:43 +08:00 |
 LiuJiaNan
|
c912472911
|
人员轨迹、报警信息
|
2024-04-16 16:25:19 +08:00 |
|
liujun
|
35500daad3
|
一公司人员定位地图功能完善
|
2024-04-16 16:09:16 +08:00 |
|
liujun
|
4a2a2969a0
|
Merge branch 'pet' into dev
|
2024-04-13 18:48:17 +08:00 |
 guoyuepeng
|
756be6d2d4
|
Merge pull request 'limingyu-20240412-消防点位坐标地图' (#11) from limingyu-20240412-消防点位坐标地图 into dev
Reviewed-on: #11
|
2024-04-13 18:08:02 +08:00 |
|
guoyuepeng
|
192a354c4f
|
1.消防模块地图修改
|
2024-04-13 18:04:36 +08:00 |
|
liujun
|
384b1e27b7
|
查询bug修复
|
2024-04-13 17:11:13 +08:00 |
|
limingyu
|
830e2d2f48
|
一公司人员定位 报警列表3
|
2024-04-13 16:48:21 +08:00 |
|
limingyu
|
ffc9dcf5fe
|
一公司人员定位 报警列表2
|
2024-04-13 16:22:26 +08:00 |
|
limingyu
|
b5aaa3d6d1
|
Merge remote-tracking branch 'origin/liujun-2024-04-12-一公司人员定位' into liujun-2024-04-12-一公司人员定位
|
2024-04-13 16:21:58 +08:00 |
|
liujun
|
3d03d27b90
|
映射保存功能
|
2024-04-13 16:12:37 +08:00 |
|
liujun
|
83714b2115
|
映射保存功能
|
2024-04-13 15:16:58 +08:00 |