 lixioayao
|
97390d4bbb
add CHAR_LOCATEDATASMALL_TOF_EXTEND
|
6 years ago |
 zzj
|
4cacfcec12
时间戳检查移动到 site 类
|
6 years ago |
|
lixioayao
|
42dfe4e53f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
d72622530e
add log for db
|
6 years ago |
|
zzj
|
4f78658f4d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
6466e775ff
1、区域修改业务类型，
|
6 years ago |
 liheting
|
44111b2029
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
 chensongchao
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 years ago |
|
chensongchao
|
a2add260df
合并是不小心把web连接去掉了。加回来
|
6 years ago |
|
chensongchao
|
8f42ffd877
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
6 years ago |
|
zzj
|
d302df6b82
数据库初始化提前，避免初始化过程有调用造成core
|
6 years ago |
|
lixioayao
|
e38251469e
fix bug for his_event_data
|
6 years ago |
|
chensongchao
|
fdf37b7cd1
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
c63afeec50
web实时修改人员及车辆信息，通知采集服务器重新加载修改的车辆或者人员信息
|
6 years ago |
|
lixioayao
|
6bdfb9b8ea
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
204034d4b3
删除车辆超时告警
|
6 years ago |
|
zzj
|
b23198c2fe
修改前台改变配置时的日志显示
|
6 years ago |
|
zzj
|
6bf1e1ff7f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
24abfc63a7
printf-->log_info
|
6 years ago |
|
lixioayao
|
6a90c06a3d
websocket 修改Makefile.am
|
6 years ago |
|
chensongchao
|
9bf3ff72d4
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
653947693b
从0开始，与数据库保持一致
|
6 years ago |
|
chensongchao
|
873c4f8beb
web实时修改人员及车辆信息，通知采集服务器重新加载修改的车辆或者人员信息
|
6 years ago |
|
lixioayao
|
06445d7fce
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
liheting
|
16ff098473
Merge branch 'master' of daiyueteng/ya-serv into master
|
6 years ago |
|
lixioayao
|
169544e01a
增加告警显示等级，针对不同性质的用户进行区别显示
|
6 years ago |
 daiyueteng
|
1266ce93bb
web重连与静止告警
|
6 years ago |
|
daiyueteng
|
9ceda2f324
web重连与静止告警
|
6 years ago |
|
daiyueteng
|
af0c4f3934
改为无限重连
|
6 years ago |
