Commit Graph

862 Commits

Author SHA1 Message Date
fan
79f9f72c07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:48:06 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
joylink_cuiweidong
559c33bb2a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:19:43 +08:00
joylink_cuiweidong
cc8b700328 剧本录制代码调整
退出剧本代码调整
2020-05-18 15:18:57 +08:00
fan
5f9806cdb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:49:29 +08:00
fan
135b328dd1 故障操作调整 2020-05-18 14:49:16 +08:00
joylink_cuiweidong
f0d51a2771 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:00:40 +08:00
joylink_cuiweidong
bdf627e812 剧本调整 2020-05-18 14:00:16 +08:00
zyy
8e57bbe91e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:35:21 +08:00
zyy
6fdf3b74aa 调整车次窗撤销操作问题 2020-05-18 13:34:46 +08:00
joylink_cuiweidong
71eca2ad9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:33:20 +08:00
joylink_cuiweidong
25b1c09141 剧本代码调整 2020-05-18 13:32:25 +08:00
zyy
bbc79b1b17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:08:56 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
joylink_cuiweidong
f092b27282 剧本代码调整 2020-05-18 11:04:39 +08:00
joylink_cuiweidong
be4da83dcd 剧本代码调整 2020-05-18 10:31:55 +08:00
joylink_cuiweidong
8059353f06 剧本代码调整 2020-05-15 20:45:59 +08:00
joylink_cuiweidong
b1ca16b62f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 17:11:59 +08:00
joylink_cuiweidong
bda901f4c9 剧本代码调整 2020-05-15 17:11:15 +08:00
zyy
7945dedade Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:35 +08:00
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
joylink_cuiweidong
f775f76aa8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:54:59 +08:00
joylink_cuiweidong
901ab1a8bd 剧本添加提示 2020-05-15 16:54:31 +08:00
fan
e4b14d96e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 15:58:19 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
322ca86dec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 14:50:19 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
joylink_cuiweidong
d3df0afc94 剧本代码调整 2020-05-15 13:16:55 +08:00
joylink_cuiweidong
ddbf334419 剧本代码调整 2020-05-14 19:13:44 +08:00
fan
396dd0d899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:55:12 +08:00
fan
71682d00a5 区段计轴调整 2020-05-14 18:54:53 +08:00
zyy
43e6b4bca1 保存道岔状态 2020-05-14 18:49:47 +08:00
joylink_cuiweidong
3968331bbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:25:25 +08:00
joylink_cuiweidong
c226d75d6b 剧本代码调整 2020-05-14 17:24:47 +08:00
fan
5ef9b0aaaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:03:45 +08:00
fan
4f8de9cc6a 信号机批量操作调整 2020-05-14 17:03:30 +08:00
zyy
81c8ad5210 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:59 +08:00
zyy
ccf186e98e 调整区段停车点偏移量 2020-05-14 16:54:31 +08:00
fan
996b71da05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:09 +08:00
fan
126278ee01 状态表示道岔故障调整 2020-05-14 16:53:58 +08:00
fan
abec4b2b4c 西安二号线添加是否灭灯显示(CTC级) 2020-05-14 16:45:48 +08:00
zyy
0533ddfcfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:39 +08:00
zyy
42402f6223 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:11 +08:00
zyy
b735cd5b06 调整区段回车问题 2020-05-14 16:43:55 +08:00
joylink_cuiweidong
4fec468885 剧本预览代码调整 2020-05-14 15:48:25 +08:00
joylink_cuiweidong
812a7534b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:19:59 +08:00
joylink_cuiweidong
bbeb6d44aa 剧本预览代码调整 2020-05-14 15:19:07 +08:00
zyy
7833afa1fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:05:32 +08:00
zyy
04aacc3818 调整物理区段创建逻辑区段逻辑 2020-05-14 15:05:19 +08:00
joylink_cuiweidong
0684d2a93c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 14:37:17 +08:00