Commit Graph

7815 Commits

Author SHA1 Message Date
joylink_cuiweidong
d8ae05cb06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:38:01 +08:00
joylink_cuiweidong
b9f71f75d9 添加剧本删除动作接口
修改剧本编制样式
2020-11-03 16:37:47 +08:00
zyy
eef7ccfba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:18:29 +08:00
zyy
4c00fa1a90 调整国赛运行图显示 2020-11-03 16:18:15 +08:00
joylink_cuiweidong
8ad829cf24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:06:50 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
2020-11-03 16:06:11 +08:00
fan
ffbd8a06f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 14:06:41 +08:00
fan
4e0b6dc7e6 取消实训考试重置默认状态 2020-11-03 14:06:30 +08:00
zyy
f08640c546 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 13:54:37 +08:00
zyy
85fee71570 删除打印 2020-11-03 13:54:26 +08:00
fan
a30f73a0ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 13:39:36 +08:00
fan
dcd0607973 北交大项目登录 2020-11-03 13:39:14 +08:00
zyy
5c6ce655d6 增加了报警声音 2020-11-03 13:21:56 +08:00
zyy
6eefe21444 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 10:30:43 +08:00
zyy
333c8b2c86 调整福州综合监控故障设置 2020-11-03 10:30:26 +08:00
joylink_cuiweidong
877a46cca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 09:55:26 +08:00
joylink_cuiweidong
fb09155f34 接触网 绘图状态代码调整 2020-11-03 09:55:11 +08:00
fan
815735b8c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 19:09:16 +08:00
fan
ccabd4a729 实训问题调整 2020-11-02 19:08:04 +08:00
joylink_cuiweidong
30c71d02fb 供电线故障代码调整 2020-11-02 18:51:53 +08:00
joylink_cuiweidong
8b5d848cf9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 17:54:43 +08:00
joylink_cuiweidong
cfdb7d3187 故障操作 添加手动开启屏蔽门 2020-11-02 17:54:25 +08:00
fan
855f23a683 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 17:46:31 +08:00
fan
f353ddc9c0 实训问题调整 2020-11-02 17:46:18 +08:00
joylink_cuiweidong
dff3b6b105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:53:59 +08:00
joylink_cuiweidong
d135c4cf10 成都三号线 菜单点击代码调整
屏蔽门故障 添加 屏蔽门无法开启 故障
2020-11-02 16:52:58 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
b26f3044dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:12:29 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
fan
9ace3fc66f 绘图问题调整 2020-11-02 14:03:13 +08:00
joylink_cuiweidong
9f95af633a 代码调整 2020-11-02 10:01:24 +08:00
zyy
eddaf7635a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 18:17:12 +08:00
zyy
be8a5f7768 推出场景清空信息 2020-10-30 18:16:40 +08:00
sunzhenyu
744a990097 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 18:09:32 +08:00
sunzhenyu
6ca823e7e8 增加三维编辑器区段修改功能,增加三维代码注释,剔除旧数据相关三维内容 2020-10-30 18:09:24 +08:00
zyy
f3422aeb20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 17:40:26 +08:00
zyy
e2fd8ea49e 调整菜单右键 2020-10-30 17:40:12 +08:00
joylink_cuiweidong
f749e4fc2a 竞赛代码调整 2020-10-30 16:04:32 +08:00
joylink_cuiweidong
0bac44bba7 竞赛代码调整 2020-10-30 15:52:23 +08:00
joylink_cuiweidong
7dbe32237d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:36:53 +08:00
joylink_cuiweidong
12f08768da 代码调整 2020-10-30 15:36:39 +08:00
zyy
dfbca08c80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:26:54 +08:00
zyy
04ec59780b 增加语音聊天当前播放提示 2020-10-30 15:26:31 +08:00
joylink_cuiweidong
d58aa3b4f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:07:46 +08:00
joylink_cuiweidong
06b0360aa1 剧本编制代码调整 2020-10-30 15:06:05 +08:00
fan
95e010d046 报警状态调整 2020-10-30 14:41:42 +08:00
fan
8a92b5e448 报警状态调整 2020-10-30 14:39:38 +08:00
fan
4f567c474a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 14:15:12 +08:00
fan
7425506054 报警状态调整 2020-10-30 14:15:00 +08:00