 lixioayao
|
509f7576f6
del site_area && area_tool 增加sited对象
|
5 years ago |
|
lixioayao
|
546e0f03a1
修改了分站初始化顺序，删除了不必要的函数和日志
|
5 years ago |
|
lixioayao
|
123ab80a13
增加分站进出逻辑
|
5 years ago |
|
lixioayao
|
967bde2172
merge
|
5 years ago |
|
lixioayao
|
b14ee56502
增加了前端推送多个区域信息包括地标信息的功能，修改了之前的地标信息的逻辑
|
5 years ago |
 liulei
|
dbbd8c6a44
增加人卡的工作类型借口
|
5 years ago |
 chensongchao
|
2171c2289d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
2ea1e5721f
complie
|
5 years ago |
|
chensongchao
|
6a9823d7ca
同步主干代码，修改一些编译不过的代码
|
5 years ago |
 daiyueteng
|
b116456e87
注释工时利用率
|
5 years ago |
|
lixioayao
|
cce64fe3d4
fix reader_erro
|
5 years ago |
|
daiyueteng
|
de14afd6c2
增加头文件，注释掉三率工时利用率代码
|
5 years ago |
|
daiyueteng
|
80021b0031
把#include"ya_evnet.h" 改为 #include"evnet.h"
|
5 years ago |
|
lixioayao
|
ebc357ccad
完善区域框架逻辑
|
5 years ago |
|
lixioayao
|
74e90d2568
区域注册area_business && 获取地标 && 完善on_point
|
5 years ago |
|
lixioayao
|
3d707683eb
调整推送点位置，完善区域逻辑功能，修复部分bug
|
5 years ago |
 zzj
|
df49b20d11
1、每张卡可以在多个区域内部
|
5 years ago |
|
lixioayao
|
aee817ca91
fix bug
|
5 years ago |
|
lixioayao
|
06057441c8
rear end
|
5 years ago |
|
lixioayao
|
95b734bb61
reverse alarm
|
5 years ago |
|
chensongchao
|
f44cbdd70b
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
chensongchao
|
98df326089
修改井下超员是检查函数的参数 由on_check_overtime(std::shared_ptr<person>(this))改成on_check_overtime(int id,int type)
|
5 years ago |
|
zzj
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
5 years ago |
|
lixioayao
|
df1d088cb0
record staffer no.
|
5 years ago |
|
陈松潮
|
6713db0bf0
井下超时处理
|
5 years ago |
|
lixioayao
|
7711ab8706
重构event && 拆离card文件减少文件依赖 && db和websocket 独立模块 && 增加分站中断告警，红膜考勤，采煤机数据解析
|
5 years ago |
|
zzj
|
0e5c26419d
调整文件结构,db、websocket调整为静态库
|
5 years ago |
