 lixioayao
|
ab28ff9be8
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 gadi atpakaļ |
|
lixioayao
|
1f9b7a1e1b
修复限制人员入井逻辑，修改时
|
6 gadi atpakaļ |
 zzj
|
3bf8e45be3
修改分站路径初始化处理,允许定义以下路径,需要路径连续，分站不可距离路径太远(10pt),不再限制ant-flag在[-2,2]之间
|
6 gadi atpakaļ |
|
lixioayao
|
c1849343e3
解决stoi out_of_range 得异常
|
6 gadi atpakaļ |
|
lixioayao
|
a833f07b0e
完善删除区域逻辑
|
6 gadi atpakaļ |
|
lixioayao
|
9a156ff918
修复前端推送区域消息处理逻辑bug
|
6 gadi atpakaļ |
 chensongchao
|
6f6e83f113
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 gadi atpakaļ |
|
chensongchao
|
5820dcb5dc
修改禁止人员下井功能。。解决可能多线程导致的问题
|
6 gadi atpakaļ |
|
lixioayao
|
046323dac3
修改手动升井逻辑，不在盲区的卡，不允许升井
|
6 gadi atpakaļ |
|
chensongchao
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 gadi atpakaļ |
|
chensongchao
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
6 gadi atpakaļ |
|
chensongchao
|
fdf37b7cd1
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 gadi atpakaļ |
|
chensongchao
|
c63afeec50
web实时修改人员及车辆信息，通知采集服务器重新加载修改的车辆或者人员信息
|
6 gadi atpakaļ |
|
zzj
|
b23198c2fe
修改前台改变配置时的日志显示
|
6 gadi atpakaļ |
|
chensongchao
|
873c4f8beb
web实时修改人员及车辆信息，通知采集服务器重新加载修改的车辆或者人员信息
|
6 gadi atpakaļ |
 daiyueteng
|
48a8805ae9
删除所有告警
|
6 gadi atpakaļ |
|
daiyueteng
|
f7c12cdff0
初步
|
6 gadi atpakaļ |
|
daiyueteng
|
b5b5e891af
整理module_service
|
6 gadi atpakaļ |
|
daiyueteng
|
4590d13a73
修改 module_meta_date_changed
|
6 gadi atpakaļ |
|
chensongchao
|
efce852bd4
移植动态画禁区功能 实现人员禁区告警和呼叫禁区人员，出区域后取消告警和呼叫
|
6 gadi atpakaļ |
|
lixioayao
|
71a8aed0ad
reader_error && IDSDK && common function
|
6 gadi atpakaļ |
|
daiyueteng
|
dd076817a9
加载采煤机 掘进机
|
6 gadi atpakaļ |
|
daiyueteng
|
e8ad8f3bd5
升井、删除卡增加离开区域操作
|
6 gadi atpakaļ |
|
daiyueteng
|
4692c14df5
增加修改基础数据1
|
6 gadi atpakaļ |
