 zhuyf
|
100a1b4e5e
before merge
|
4 gadi atpakaļ |
 chensongchao
|
0bf1203748
三率模块，基准点数据修改
|
5 gadi atpakaļ |
|
chensongchao
|
f0d448c7ba
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 gadi atpakaļ |
 liulei
|
fbc6518f57
增加工作面参数更改三率模块的处理
|
5 gadi atpakaļ |
|
chensongchao
|
38216c9b03
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 gadi atpakaļ |
|
chensongchao
|
87d6908e08
区域时间段超员设置及功能
|
5 gadi atpakaļ |
|
liulei
|
b2a64cba9a
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 gadi atpakaļ |
|
liulei
|
77c92731ed
增加地标和地质断层更新代码，修正升级后loction_card未初始化情况
|
5 gadi atpakaļ |
|
chensongchao
|
6288b3fd60
优化公告牌显示
|
5 gadi atpakaļ |
|
chensongchao
|
f891eacaa4
地图修改协议
|
5 gadi atpakaļ |
 zzj
|
bf4ee755e3
分站路径更新逻辑
|
5 gadi atpakaļ |
|
chensongchao
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
5 gadi atpakaļ |
 lixioayao
|
169544e01a
增加告警显示等级，针对不同性质的用户进行区别显示
|
5 gadi atpakaļ |
|
chensongchao
|
efce852bd4
移植动态画禁区功能 实现人员禁区告警和呼叫禁区人员，出区域后取消告警和呼叫
|
5 gadi atpakaļ |
|
lixioayao
|
f40cd71b08
monkeycar , and push card point to web
|
6 gadi atpakaļ |
|
lixioayao
|
b1e5544770
merge..lemons's project
|
6 gadi atpakaļ |
