 chensongchao
|
85139ee40a
功能测试，告警测试-修改BUG
|
6 years ago |
|
chensongchao
|
3684eac2ea
同步主干代码，修改冲突的代码
|
6 years ago |
 zzj
|
65438a86a1
编译文件调整
|
6 years ago |
|
zzj
|
b9c72d2182
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
6492f30c2c
Makefile.am 添加area_business相关文件
|
6 years ago |
 liheting
|
d71b2587a4
Merge branch 'master' of liulei/ya-serv into master
|
6 years ago |
 liulei
|
8ce10ec8e5
解决冲突
|
6 years ago |
|
liulei
|
dbbd8c6a44
增加人卡的工作类型借口
|
6 years ago |
|
liheting
|
7e1bc71c0f
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
chensongchao
|
2c87ed9ec8
优化 告警的代码，及框架下业务上的代码
|
6 years ago |
|
chensongchao
|
c499c92cfd
area_business_work_rate.cpp 缺少
|
6 years ago |
|
chensongchao
|
2171c2289d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
b873cbf931
新增禁区，判断禁区中是否有人，并做相应的处理，告警等
|
6 years ago |
 daiyueteng
|
84dee1fbd9
工时利用率 区域调整
|
6 years ago |
|
chensongchao
|
4ab6d0a8e3
修改三率编译库名称
|
6 years ago |
|
daiyueteng
|
336b3866bc
工时利用率 卡调整
|
6 years ago |
|
daiyueteng
|
04f3046a13
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
c4db6d604d
删除ya_event.h
|
6 years ago |
|
daiyueteng
|
df1b3576cb
修改 void save_attendance
|
6 years ago |
|
liheting
|
61b734d6cc
Merge branch 'master' of liulei/ya-serv into master
|
6 years ago |
|
liulei
|
101f489f40
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
liulei
|
527247cd6f
调整文件格式
|
6 years ago |
|
daiyueteng
|
34a56a2812
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
5e6a8e3f10
优化头文件
|
6 years ago |
|
liulei
|
9d8a2f1b9f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
liheting
|
10da641ebe
Merge branch 'master' of liulei/ya-serv into master
|
6 years ago |
|
liulei
|
1a6726a345
è°â调整乱码
|
6 years ago |
|
daiyueteng
|
48aa68b8c6
增加配置文件变量可读性
|
6 years ago |
|
daiyueteng
|
48a8805ae9
删除所有告警
|
6 years ago |
|
chensongchao
|
ad69fa3744
把之前的功能移到新框架上,1.井下，区域 超时超员 2.分站掉电 3.禁区进入呼叫
|
6 years ago |
