 lixioayao
|
ab28ff9be8
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
1f9b7a1e1b
修复限制人员入井逻辑，修改时
|
5 years ago |
 zzj
|
babeb78706
修改手动升井逻辑，修改卡map_id从分站直接获取。
|
5 years ago |
|
zzj
|
cf902282e0
日志输出相关的修改
|
6 years ago |
|
zzj
|
3bf8e45be3
修改分站路径初始化处理,允许定义以下路径,需要路径连续，分站不可距离路径太远(10pt),不再限制ant-flag在[-2,2]之间
|
6 years ago |
|
lixioayao
|
f67d4632de
增加日志查看供电告警信息
|
6 years ago |
|
lixioayao
|
417947a307
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
bf4ee755e3
分站路径更新逻辑
|
6 years ago |
|
zzj
|
41c2d5326f
添加web端调整分站路径时自动更新card_path
|
6 years ago |
|
lixioayao
|
c1849343e3
解决stoi out_of_range 得异常
|
6 years ago |
|
zzj
|
cff1f8514b
主线程添加了最外层的异常打印。
|
6 years ago |
 chensongchao
|
c70c9f0518
修改禁止人员下井的SQL
|
6 years ago |
|
zzj
|
64aff59878
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
3c96940c35
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
40c18d3c6a
合并代码
|
6 years ago |
|
chensongchao
|
502b6529a6
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
514c23ca75
1、修改区域/区域业务类型赋值在区域更新时混淆错误的问题。
|
6 years ago |
|
lixioayao
|
d006776dbe
修复限制入井初始化
|
6 years ago |
|
lixioayao
|
3291cc722a
限制人员入井
|
6 years ago |
|
lixioayao
|
d22a7215dc
m_area_type 保存区域业务逻辑值
|
6 years ago |
|
chensongchao
|
ed9d332550
去除多余的功能，禁止人员下井
|
6 years ago |
|
chensongchao
|
2e5455ee08
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
cc9b2c8718
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
fc99b141a5
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
400a1c7986
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
d49829f39b
del person_time
|
6 years ago |
|
lixioayao
|
c9c9d0444d
修复冲突
|
6 years ago |
|
lixioayao
|
1aaa4e4930
区域时长改成分钟
|
6 years ago |
|
zzj
|
f9c8be31c7
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
9332d99684
修改人员井下超时的时间单位为分钟。
|
6 years ago |
