 chensongchao
|
8f42ffd877
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
chensongchao
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
5 years ago |
 zzj
|
d302df6b82
数据库初始化提前，避免初始化过程有调用造成core
|
5 years ago |
 lixioayao
|
e38251469e
fix bug for his_event_data
|
5 years ago |
|
zzj
|
6bf1e1ff7f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
zzj
|
24abfc63a7
printf-->log_info
|
5 years ago |
 daiyueteng
|
9ceda2f324
web重连与静止告警
|
5 years ago |
|
daiyueteng
|
af0c4f3934
改为无限重连
|
5 years ago |
|
daiyueteng
|
c74c6956bd
web重连
|
5 years ago |
 zzj
|
f23e0612bd
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
chensongchao
|
83c357e1c6
编译问题，写错了
|
5 years ago |
 liheting
|
61b063787d
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
chensongchao
|
a89877cb8a
三率告警回调设置
|
5 years ago |
|
chensongchao
|
3c241e3569
模拟工具推送北翼胶带掘进机脚本，采集宕机。map查找写反了，没查到到数据，则继续运行导致修改了回调函数指针
|
5 years ago |
|
zzj
|
6f7f926dfd
分站路径为空时，输出warn
|
5 years ago |
 zzj
|
6985959f06
-----
|
5 years ago |
|
lixioayao
|
546e0f03a1
修改了分站初始化顺序，删除了不必要的函数和日志
|
5 years ago |
|
lixioayao
|
123ab80a13
增加分站进出逻辑
|
5 years ago |
|
lixioayao
|
b14ee56502
增加了前端推送多个区域信息包括地标信息的功能，修改了之前的地标信息的逻辑
|
5 years ago |
|
lixioayao
|
da736b9eb7
fix db encode
|
5 years ago |
|
lixioayao
|
2ea1e5721f
complie
|
5 years ago |
|
chensongchao
|
276e833b5b
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
daiyueteng
|
af8d1d48bd
删除包含头文件
|
5 years ago |
|
chensongchao
|
1d0cf5a7e1
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
daiyueteng
|
80021b0031
把#include"ya_evnet.h" 改为 #include"evnet.h"
|
5 years ago |
|
chensongchao
|
552fe6a22a
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
ebc357ccad
完善区域框架逻辑
|
5 years ago |
|
lixioayao
|
3d707683eb
调整推送点位置，完善区域逻辑功能，修复部分bug
|
5 years ago |
|
lixioayao
|
9e47da93bd
fix timer
|
5 years ago |
|
zzj
|
df49b20d11
1、每张卡可以在多个区域内部
|
5 years ago |
