 lixioayao
|
7677d70d1c
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
cb81bf2eb4
使用vehicle_type_id 来确认采煤机和掘进机
|
5 years ago |
 liheting
|
66a2f9c455
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
 chensongchao
|
aaae5765dc
把update放到cpp中
|
5 years ago |
|
chensongchao
|
4b0ac1fcdb
区域更新设置默认值
|
5 years ago |
|
liheting
|
5e4779ae2e
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
chensongchao
|
07793cb78b
超员限制BUG
|
5 years ago |
|
liheting
|
3ea517dc56
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
chensongchao
|
8463b39617
Default Changelist
|
5 years ago |
|
chensongchao
|
b3ecf48a94
去掉保存井上分站第一次接收数据的时间
|
5 years ago |
|
chensongchao
|
51e6876e1b
虹膜考勤中-新增部门，和井上分站第一次接收的时间
|
5 years ago |
|
chensongchao
|
962200a398
his_location_area拆分多出his_location_reader(分站区域进出入记录)
|
5 years ago |
|
chensongchao
|
0bf1203748
三率模块，基准点数据修改
|
5 years ago |
|
lixioayao
|
a14a724d14
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
68e6e1bc22
fix conficit
|
5 years ago |
|
liheting
|
d54168e5aa
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
lixioayao
|
99fad6cccb
多个分站数据更新功能 && WS_1
|
5 years ago |
|
chensongchao
|
41e9f0d649
区域时间段超员设置及功能--优化数据加载
|
5 years ago |
|
chensongchao
|
f0d448c7ba
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
chensongchao
|
8e72fe21b8
区域时间段超员设置及功能--优化·
|
5 years ago |
|
liheting
|
c23104b20b
Merge branch 'master' of liulei/ya-serv into master
|
5 years ago |
 liulei
|
fbc6518f57
增加工作面参数更改三率模块的处理
|
5 years ago |
|
chensongchao
|
38216c9b03
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
chensongchao
|
87d6908e08
区域时间段超员设置及功能
|
5 years ago |
|
liheting
|
ec16bc637c
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
liheting
|
1704ae8e46
Merge branch 'master' of liulei/ya-serv into master
|
5 years ago |
|
chensongchao
|
c387b022dd
地图修改比例尺错误
|
5 years ago |
|
liheting
|
650280a02c
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
|
chensongchao
|
31a88537e7
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
chensongchao
|
01be0a7c06
井上分站员工运动过程中会更新离开区域的时间
|
5 years ago |
