yuan
|
8da25a588d
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-15 11:21:24 +08:00 |
|
yuan
|
9c3deb02e6
|
发布模型列表
|
2021-07-15 11:20:20 +08:00 |
|
sunzhenyu
|
d6f5205ae4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-15 10:56:10 +08:00 |
|
sunzhenyu
|
663e874e06
|
修改三维课程编辑器
|
2021-07-15 10:56:04 +08:00 |
|
fan
|
d2357e0797
|
一键生成集中站现地配置
|
2021-07-15 10:50:29 +08:00 |
|
fan
|
3bb9c2a8d4
|
调整集中站设备显示
|
2021-07-14 09:32:12 +08:00 |
|
yuan
|
c59b0930a3
|
Merge branch 'test_eg2d' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-14 09:22:04 +08:00 |
|
yuan
|
4bb31b119a
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-14 09:20:57 +08:00 |
|
fan
|
53a71d0bab
|
暂提
|
2021-07-12 16:42:54 +08:00 |
|
fan
|
8db9414cfa
|
暂提
|
2021-07-12 16:40:41 +08:00 |
|
fan
|
24ec537739
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-12 10:39:01 +08:00 |
|
fan
|
79a85639fc
|
非管理员开放倍速功能(5倍速)
|
2021-07-12 10:38:39 +08:00 |
|
yuan
|
01ed5397ad
|
ibp盘按钮增加亮灯颜色字段
|
2021-07-12 10:37:14 +08:00 |
|
yuan
|
7e50c780ce
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-12 09:20:53 +08:00 |
|
fan
|
efe78c3611
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-09 11:26:18 +08:00 |
|
fan
|
2cdac30d19
|
仿真系统测试反馈表11:列车降级ITC后,鼠标悬停列车信息,依然显示CTC列车
|
2021-07-09 11:26:02 +08:00 |
|
yuan
|
eb7b59078a
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-09 10:32:21 +08:00 |
|
yuan
|
a641b51505
|
xa3-修改列车识别号bugfix
|
2021-07-09 10:30:51 +08:00 |
|
yuan
|
0bf309cc3d
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-08 15:59:38 +08:00 |
|
yuan
|
9e83c0b8e9
|
commit
|
2021-07-08 15:59:33 +08:00 |
|
fan
|
acba981209
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-08 15:48:21 +08:00 |
|
fan
|
af3f6fcbc8
|
TS强转站控密码为12,仿真系统为123456
|
2021-07-08 15:48:03 +08:00 |
|
yuan
|
381a1af149
|
conflict fix
|
2021-07-08 14:17:21 +08:00 |
|
yuan
|
cd3eb07730
|
PSL增加锁紧指示灯
|
2021-07-08 14:08:33 +08:00 |
|
yuan
|
ebbfc85acc
|
IBP盘增加关门按钮
|
2021-07-08 13:43:38 +08:00 |
|
yuan
|
67fe7b6774
|
xa3_头码车识别号校验修改
|
2021-07-08 11:15:04 +08:00 |
|
yuan
|
c0792b7f2f
|
commit
|
2021-07-07 17:29:06 +08:00 |
|
yuan
|
4f9c70f3cb
|
发布&删除
|
2021-07-07 10:25:49 +08:00 |
|
yuan
|
ab0d193095
|
模型绘制页面
|
2021-07-07 09:14:31 +08:00 |
|
yuan
|
95d0cd03e0
|
模型编辑
|
2021-07-06 16:17:52 +08:00 |
|
yuan
|
d84a52912d
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_eg2d
|
2021-07-06 09:53:50 +08:00 |
|
yuan
|
2bb04ad85f
|
增加模型草稿列表页
|
2021-07-06 09:53:39 +08:00 |
|
joylink_cuiweidong
|
42d0fefa71
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-06 09:51:39 +08:00 |
|
joylink_cuiweidong
|
52005bb913
|
删除计划车bug修改(bug335)
|
2021-07-06 09:51:08 +08:00 |
|
fan
|
ab699c2f79
|
添加线路配置 setManualWhenHeadTrainArriveTarget 头码车抵达目的地后变为人工车
|
2021-07-05 16:37:12 +08:00 |
|
fan
|
bdd06c3f1e
|
登录页面添加教师登录
|
2021-07-05 16:16:17 +08:00 |
|
fan
|
41be6dbd8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-05 14:28:33 +08:00 |
|
fan
|
eaa60a811b
|
邮箱=》邮箱(账号)
|
2021-07-05 14:28:18 +08:00 |
|
joylink_cuiweidong
|
d5a232c87a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 16:46:25 +08:00 |
|
joylink_cuiweidong
|
a39996e457
|
福州一号线 运行图 加线抽线
去除 西安三 运行图 加线抽线
|
2021-07-02 16:45:51 +08:00 |
|
fan
|
9d64d05202
|
删除console
|
2021-07-02 14:10:52 +08:00 |
|
fan
|
4f844f3242
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 14:02:27 +08:00 |
|
fan
|
041cabfe00
|
西安延续保护信号机名称显示调整 列车详情调整
|
2021-07-02 14:02:12 +08:00 |
|
joylink_cuiweidong
|
6ddee3ac9d
|
Merge remote-tracking branch 'remotes/origin/test_cx' into test
|
2021-07-02 13:45:32 +08:00 |
|
joylink_cuiweidong
|
7dff579224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 13:45:11 +08:00 |
|
joylink_cuiweidong
|
4e2b07829c
|
西安三号线 运行图 加线抽线功能 添加
|
2021-07-02 13:44:21 +08:00 |
|
fan
|
813a0771d9
|
添加线路配置:transferRouteCanOnlyFaultUnlock 转换轨进路只能通过故障解锁来取消
|
2021-07-02 10:02:41 +08:00 |
|
fan
|
d5357d3614
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-01 16:06:41 +08:00 |
|
fan
|
19058b1935
|
列车遮挡调整
|
2021-07-01 16:06:31 +08:00 |
|
yuan
|
fb7dbd65fb
|
列车信息显示修改
|
2021-07-01 11:29:06 +08:00 |
|