 chensongchao
|
021ebe3924
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
 lixioayao
|
59177844ec
修复冲突
|
6 years ago |
|
lixioayao
|
e5efe95062
人员升井删除告警逻辑&&重写速度告警逻辑
|
6 years ago |
 zzj
|
fd1e1313d1
细化日志显示
|
6 years ago |
 zzj
|
32d19320aa
1、修改 离开区域时不更新时间和位置的bug
|
6 years ago |
|
zzj
|
1ed4cfd0c7
修改 his_localtion_area
|
6 years ago |
|
chensongchao
|
c074100e4c
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
093d9381ba
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
bbe63f6d4d
修正最后更新时间的bug。
|
6 years ago |
|
lixioayao
|
eb5e5d8d79
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
f048839214
add log for area_info
|
6 years ago |
|
zzj
|
61055ddc3c
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
1e87445294
--
|
6 years ago |
|
zzj
|
78fd8b9947
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
019252d59f
----
|
6 years ago |
|
zzj
|
287db5006d
删除websocket/libwebsocket.a
|
6 years ago |
|
lixioayao
|
547d00f6d0
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
7c4279edbf
修复人员升井后，继续推送位置坐标的bug
|
6 years ago |
|
zzj
|
765ceaeda4
---------
|
6 years ago |
|
zzj
|
7a4040caee
---
|
6 years ago |
|
zzj
|
aeb7ee517e
井上分站直接调用area_tool::on_point逻辑
|
6 years ago |
|
lixioayao
|
5f254ece57
修复第一次有历史数据时，区域信息没有的bug
|
6 years ago |
|
lixioayao
|
b18cbd39b8
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
6c11c7643f
加载历史后，推送前端的点，推送历史
|
6 years ago |
|
zzj
|
7cba8daebf
修改crc计算的bug
|
6 years ago |
|
zzj
|
594b7137d1
修正crc计算的bug
|
6 years ago |
|
chensongchao
|
e7bc8dc41e
合并冲突
|
6 years ago |
|
chensongchao
|
c30fb14a15
合并冲突
|
6 years ago |
|
chensongchao
|
10193b1307
合并冲突
|
6 years ago |
|
chensongchao
|
dad7166f98
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
