 liulei
|
bcda524c64
修改事件obj_id为车卡id
|
6 years ago |
|
liulei
|
11b2bad330
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
d9e47aaa84
修改采煤面司机与车卡告警中司机与车卡距离计算的bug
|
6 years ago |
 lainian
|
a16f137349
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into another_versionon_server
|
6 years ago |
 祝云飞
|
9bbe3dcf1f
Merge branch 'three_rates' of liulei/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
19b3bef0e5
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
52309a3f10
标识卡信号丢失业务判断中下井人员遍历迭代器失效的bug
|
6 years ago |
|
lainian
|
a9f2e513c5
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into another_versionon_server
|
6 years ago |
|
祝云飞
|
7eaa02a007
Merge branch 'three_rates' of liulei/YA-YAServer into three_rates
|
6 years ago |
|
lainian
|
937837cf19
增加调试采煤机有定位无轨迹日志
|
6 years ago |
|
liulei
|
44033b5cad
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
48f9a46cd9
修改工作面司机和车卡警告枚举为37
|
6 years ago |
|
祝云飞
|
6b65f116e3
Merge branch 'three_rates' of liulei/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
a447565b5e
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
9a848991ce
添加工作司机和车卡告警
|
6 years ago |
 liheting
|
d9aa451a13
增加车辆防追尾告警功能
|
6 years ago |
|
liheting
|
28017b086c
车辆防追尾告警
|
6 years ago |
|
liheting
|
8f47f59be2
rear_end vehicle function
|
6 years ago |
|
祝云飞
|
a6e5c0a6ba
Merge branch 'another_versionon_server' of lainian/YA-YAServer into three_rates
|
6 years ago |
|
lainian
|
b601d7b91b
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into another_versionon_server
|
6 years ago |
|
lainian
|
811d1f239f
打开超时关机代码
|
6 years ago |
|
researchman
|
5b70694159
fix merge
|
6 years ago |
|
lainian
|
bf92271d02
正规循环率表增加采煤机运动方向字段
|
6 years ago |
|
researchman
|
2ad308926a
fix bug
|
6 years ago |
|
lainian
|
2e47861d62
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into another_versionon_server
|
6 years ago |
|
lainian
|
30c4d5a12a
修改起刀时间
|
6 years ago |
|
researchman
|
ba54cee00f
no fix
|
6 years ago |
|
lainian
|
09d50c4929
添加调试日志
|
6 years ago |
|
researchman
|
927fcc0dec
Merge branch 'three_rates' of http://124.204.33.42:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
researchman
|
f88bf82e7e
fix area_id
|
6 years ago |
