fan
|
1c2037f9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-28 14:55:30 +08:00 |
|
fan
|
e6f479379b
|
列车限速区间选择5-65
|
2021-06-28 14:55:18 +08:00 |
|
yuan
|
7514ff3270
|
bugfix-xa3-048 修改列车识别号字段显示错误
|
2021-06-28 10:40:35 +08:00 |
|
yuan
|
118a8d07d4
|
错别字修改
|
2021-06-28 10:21:16 +08:00 |
|
yuan
|
0c219aff71
|
抽线
|
2021-06-25 15:34:51 +08:00 |
|
yuan
|
51a0ebd5fe
|
抽线
|
2021-06-25 15:34:35 +08:00 |
|
fan
|
5a02b528c3
|
Merge remote-tracking branch 'origin/test' into master2
|
2021-06-24 18:19:00 +08:00 |
|
yuan
|
65d84a98a8
|
信号机距离计算方式修改
|
2021-06-24 18:14:36 +08:00 |
|
joylink_cuiweidong
|
8528475bcb
|
删除404页面的 一些文字
|
2021-06-24 15:15:31 +08:00 |
|
joylink_cuiweidong
|
8a13e4475b
|
第三方登陆 去掉下面的icp备案信息
|
2021-06-24 15:02:49 +08:00 |
|
fan
|
b9eb5f061d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-24 13:55:06 +08:00 |
|
fan
|
e1b5c43fb7
|
zc设备数据添加noService属性
|
2021-06-24 13:54:44 +08:00 |
|
joylink_cuiweidong
|
26c6e18284
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-24 13:05:20 +08:00 |
|
joylink_cuiweidong
|
65c235bfcd
|
第三方登陆跳转代码调整
|
2021-06-24 13:05:00 +08:00 |
|
sunzhenyu
|
5bf37dfa0c
|
修改三维设备屏蔽门模型，修改屏蔽门描述
|
2021-06-24 11:10:41 +08:00 |
|
sunzhenyu
|
50102fb62a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-23 18:09:31 +08:00 |
|
sunzhenyu
|
0e2ee25cb6
|
修改三维单体设备屏蔽门，增加拆解逻辑
|
2021-06-23 18:09:23 +08:00 |
|
joylink_cuiweidong
|
3d4ba98297
|
zc 代码调整
|
2021-06-23 15:55:04 +08:00 |
|
joylink_cuiweidong
|
8f9ab98fb2
|
zc 绘图 添加 集中站列表
|
2021-06-23 15:36:23 +08:00 |
|
joylink_cuiweidong
|
b841022401
|
zc 绘图 代码调整
|
2021-06-23 13:52:22 +08:00 |
|
fan
|
08b824dd5a
|
Bug323 西安三：现地无法切换车站，提示：调整角色成员失败
|
2021-06-23 10:09:19 +08:00 |
|
yuan
|
55ae33c204
|
移除无用代码
|
2021-06-22 18:03:29 +08:00 |
|
sunzhenyu
|
b27ca87efd
|
Merge brancht 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-22 17:27:32 +08:00 |
|
sunzhenyu
|
7f15943ee1
|
修改大铁三维单体设备道岔转辙机zdj9
|
2021-06-22 17:27:26 +08:00 |
|
yuan
|
3081681aaf
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder
|
2021-06-22 17:19:03 +08:00 |
|
yuan
|
f032e3f1ee
|
地图编辑-应答器增加一键关联到信号机功能
|
2021-06-22 17:18:49 +08:00 |
|
joylink_cuiweidong
|
c7569931ff
|
哈尔滨线路问题 上行设置了越站后显示在轨道上看不清楚，需要调一下位置。
|
2021-06-22 17:06:09 +08:00 |
|
yuan
|
1523ab6f51
|
应答器关联区段显示bug修复,增加选中高亮
|
2021-06-22 14:40:21 +08:00 |
|
joylink_cuiweidong
|
21115775fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-22 10:14:59 +08:00 |
|
joylink_cuiweidong
|
a6d01035dd
|
成都三，福州一实训 说明修改
|
2021-06-22 10:14:39 +08:00 |
|
fan
|
4efa513836
|
调整计轴故障ARB优先级
|
2021-06-22 09:27:11 +08:00 |
|
joylink_cuiweidong
|
14da4cbc2b
|
成都三号线 实训说明调整
|
2021-06-21 16:49:13 +08:00 |
|
joylink_cuiweidong
|
22af8c1af7
|
西安二号线 宁波三号线 实训说明修改
|
2021-06-21 14:13:00 +08:00 |
|
joylink_cuiweidong
|
1879398d92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-21 13:24:56 +08:00 |
|
joylink_cuiweidong
|
406f23eb7c
|
福州一 宁波一 实训 描述修改
|
2021-06-21 13:24:35 +08:00 |
|
fan
|
60a428c91f
|
添加ARB故障
|
2021-06-21 10:06:13 +08:00 |
|
yuan
|
5d22b7a548
|
IBP盘 - 报警器,圆灯,按钮增加区分上下行字段
|
2021-06-18 10:36:45 +08:00 |
|
yuan
|
71c4735088
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ibp
|
2021-06-18 09:10:46 +08:00 |
|
fan
|
fabe73382d
|
Merge remote-tracking branch 'origin/test'
|
2021-06-17 18:43:42 +08:00 |
|
fan
|
f6b90441f4
|
西安三站台状态管理显示调整(again again)
|
2021-06-17 18:43:10 +08:00 |
|
fan
|
61315c230b
|
Merge remote-tracking branch 'origin/test'
|
2021-06-17 18:19:36 +08:00 |
|
fan
|
320662e6a0
|
西安三站台状态管理显示调整(again)
|
2021-06-17 18:18:25 +08:00 |
|
fan
|
544ba5af63
|
西安三站台状态管理显示调整
|
2021-06-17 18:03:03 +08:00 |
|
fan
|
82f38c349b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_cunzai
|
2021-06-17 17:52:46 +08:00 |
|
fan
|
841763d48a
|
存在仿真管理调整
|
2021-06-17 17:52:28 +08:00 |
|
joylink_cuiweidong
|
e68991538d
|
哈尔滨设备登陆 车辆段 运行图编辑 报错调整
|
2021-06-17 17:35:17 +08:00 |
|
joylink_cuiweidong
|
b96b77e927
|
哈尔滨设备登陆 车辆段 运行图编辑 报错调整
|
2021-06-17 17:00:33 +08:00 |
|
joylink_cuiweidong
|
fefbf97c99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-17 15:57:09 +08:00 |
|
joylink_cuiweidong
|
c1a3ba8b00
|
哈尔滨设备登陆 车辆段 运行图编辑 报错调整
|
2021-06-17 15:56:08 +08:00 |
|
sunzhenyu
|
ee21f2f67c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-17 15:50:25 +08:00 |
|