Commit Graph

5601 Commits

Author SHA1 Message Date
zyy
3069cf2112 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 17:08:32 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
fan
9e03602403 草稿地图右键点击改变tree选中状态 2020-05-18 16:08:49 +08:00
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
3e64c6da02 西安三号线 仿真系统车次与实际车次显示不符 修改 2020-05-18 11:32:46 +08:00
joylink_cuiweidong
f092b27282 剧本代码调整 2020-05-18 11:04:39 +08:00
joylink_cuiweidong
2844386ad3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 10:32:31 +08:00
joylink_cuiweidong
be4da83dcd 剧本代码调整 2020-05-18 10:31:55 +08:00
fan
fbd0dbee74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 09:11:38 +08:00
fan
08f5edbb53 调整接口 2020-05-18 09:11:28 +08:00
joylink_cuiweidong
9bad1d2eb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 20:47:11 +08:00
joylink_cuiweidong
8059353f06 剧本代码调整 2020-05-15 20:45:59 +08:00
program-walker
8f1961b9ae Merge remote-tracking branch 'origin/test' 2020-05-15 20:31:10 +08:00
fan
ce8ded0bfb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:25:35 +08:00
fan
cc6227f6f4 故障调整 2020-05-15 19:24:58 +08:00
zyy
93f7210596 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:01:18 +08:00
zyy
674bcea387 调整综合监控 2020-05-15 19:01:07 +08:00
fan
c0d75502fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:48:38 +08:00
fan
d47a986fcc 故障操作&贵州状态班级展示 2020-05-15 18:48:10 +08:00
zyy
191f9358be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:36:42 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +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
dc783bd2a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:14 +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
6aeb2d1b8d 删除localStore 操作 2020-05-15 16:33:14 +08:00
fan
a13567faaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:26:37 +08:00
fan
9db76cbf52 添加贵州装备教师课程删除功能 2020-05-15 16:26:21 +08:00
zyy
bc00f1660a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:01:28 +08:00
zyy
6391e8e881 调整竞赛系统路径,页面路由配置 2020-05-15 16:01:16 +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
399111c682 调整列表字段显示 2020-05-15 14:59:53 +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