 lixioayao
|
123ab80a13
增加分站进出逻辑
|
6 years ago |
|
lixioayao
|
b14ee56502
增加了前端推送多个区域信息包括地标信息的功能，修改了之前的地标信息的逻辑
|
6 years ago |
|
lixioayao
|
da736b9eb7
fix db encode
|
6 years ago |
|
lixioayao
|
2ea1e5721f
complie
|
6 years ago |
 chensongchao
|
276e833b5b
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
 daiyueteng
|
af8d1d48bd
删除包含头文件
|
6 years ago |
|
chensongchao
|
1d0cf5a7e1
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
80021b0031
把#include"ya_evnet.h" 改为 #include"evnet.h"
|
6 years ago |
|
chensongchao
|
552fe6a22a
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
ebc357ccad
完善区域框架逻辑
|
6 years ago |
|
lixioayao
|
3d707683eb
调整推送点位置，完善区域逻辑功能，修复部分bug
|
6 years ago |
|
lixioayao
|
9e47da93bd
fix timer
|
6 years ago |
 zzj
|
df49b20d11
1、每张卡可以在多个区域内部
|
6 years ago |
|
lixioayao
|
aee817ca91
fix bug
|
6 years ago |
|
chensongchao
|
1145c1a794
隔爆电源交流电掉电告警功能---分站消息处理
|
6 years ago |
|
lixioayao
|
06057441c8
rear end
|
6 years ago |
|
lixioayao
|
95b734bb61
reverse alarm
|
6 years ago |
|
chensongchao
|
364e6a65cd
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
7711ab8706
重构event && 拆离card文件减少文件依赖 && db和websocket 独立模块 && 增加分站中断告警，红膜考勤，采煤机数据解析
|
6 years ago |
|
chensongchao
|
e51105da6c
移植人员井下超员告警正常功能已完成
|
6 years ago |
|
lixioayao
|
71a8aed0ad
reader_error && IDSDK && common function
|
6 years ago |
|
chensongchao
|
0fe457c798
删除db_api下的文件，改用 libya_db.so进行DB操作
|
6 years ago |
|
lixioayao
|
13fb70e05c
merge main.cpp card.cpp
|
6 years ago |
|
lixioayao
|
b5149ee14e
point.h
|
6 years ago |
|
chensongchao
|
21dac69844
把数据库的连接池单实例创建 放到CDBSingletionDefine.h 对应修改调用头文件
|
6 years ago |
|
lixioayao
|
8dd720e30c
three rates
|
6 years ago |
|
lixioayao
|
a96598ccb5
three rates ....and staff_id
|
6 years ago |
|
lixioayao
|
208e296358
添加历史轨迹
|
6 years ago |
|
lixioayao
|
755019cdbf
fix bug
|
6 years ago |
|
lixioayao
|
61da918dbb
add his_location
|
6 years ago |
