 liyutong
|
f03be5c887
Merge remote-tracking branch 'remotes/collector/three_rates' into three_rates
|
6 years ago |
|
liyutong
|
4344aa3f59
修改工时利用率时间BUG
|
6 years ago |
 lainian
|
cd4919ae43
更换重启标记
|
6 years ago |
 researchman
|
1ef397a5c3
Merge branch 'three_rates' of http://124.204.33.42:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
researchman
|
dc0f40a86f
fix merge
|
6 years ago |
 liulei
|
6f0404b502
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
b7f2685c7e
修改采煤机与机头位置距离记录格式和逻辑
|
6 years ago |
|
lainian
|
97df0d29f5
merge
|
6 years ago |
|
lainian
|
cc30841c85
1. 异常重启逻辑处理
|
6 years ago |
|
researchman
|
bdbe146174
modify simulate card
|
6 years ago |
|
researchman
|
1cc92d890e
modify new juejinji calc way
|
6 years ago |
|
lainian
|
cd47ed4542
超时关机处理移至_thread_timer
|
6 years ago |
|
researchman
|
4695cd7219
fix merge
|
6 years ago |
|
researchman
|
2ba560a770
new regular way
|
6 years ago |
|
liulei
|
7e7b6d02d2
Merge branch 'three_rates' of http://local.beijingyongan.com:3000/collector/YA-YAServer into three_rates
|
6 years ago |
|
liulei
|
7cd7765912
增加系统重启的原来状态的初始化
|
6 years ago |
|
liyutong
|
a459115224
工时利用率，启动时加载进区域/下井时间（当还未出区域/升井时）
|
6 years ago |
|
lainian
|
9607b0ec44
增加超时关机处理
|
6 years ago |
|
researchman
|
72ff874834
fix merge liulei
|
6 years ago |
|
researchman
|
8646f28cd6
fix liyutong
|
6 years ago |
|
liulei
|
337c31422e
提交综采面采煤机的正规循环率计算
|
6 years ago |
|
researchman
|
d17d4ffcb8
fix merge
|
6 years ago |
|
liyutong
|
32bea0e2d1
增加工时利用率功能
|
6 years ago |
|
researchman
|
c97325d90c
fix merge
|
6 years ago |
|
lainian
|
f45814f1b6
create another_versionon_server branch
|
6 years ago |
|
researchman
|
f1a224ee8a
no fix
|
6 years ago |
|
researchman
|
483e135c41
fix merge
|
6 years ago |
|
researchman
|
f769845fb7
add new algo tof 1d
|
6 years ago |
 liheting
|
30a64f8136
motionless
|
6 years ago |
|
researchman
|
119f03bcdb
Merge branch 'another_versionon_server' of http://124.204.33.42:3000/collector/YA-YAServer into another_versionon_server
|
6 years ago |
