Commit Graph

5267 Commits

Author SHA1 Message Date
fan
991af46e9a 调整竞赛报名参赛路径弹框复制 2020-05-22 15:23:18 +08:00
fan
8e1d552d18 调整竞赛报名参赛路径弹框复制 2020-05-22 15:20:14 +08:00
fan
32eb7faada 西安线路调整 2020-05-22 14:47:19 +08:00
fan
acfab51e85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 13:05:36 +08:00
fan
f875cd69c3 大小交路回库颜色 2020-05-22 13:05:08 +08:00
zyy
87ddea085b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 11:31:10 +08:00
zyy
03bfdd76f2 调整西安线路错误提示信息 2020-05-22 11:30:56 +08:00
fan
efbdea79e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 11:09:07 +08:00
fan
d7c5a1303d 新建列车调整 2020-05-22 11:09:00 +08:00
joylink_cuiweidong
4210599f6b 竞赛裁判系统代码调整 2020-05-22 11:07:10 +08:00
joylink_cuiweidong
c5a05ecd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 10:43:55 +08:00
joylink_cuiweidong
3b81436fbb 竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
2020-05-22 10:43:23 +08:00
zyy
105cc81cb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 10:13:28 +08:00
zyy
35208da27f 调整打包方式区分压缩 未压缩 2020-05-22 10:13:13 +08:00
joylink_cuiweidong
464363a6e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:33:08 +08:00
joylink_cuiweidong
480df83efa 竞赛裁判系统代码调整 2020-05-22 09:32:48 +08:00
sunzhenyu
1257c252f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:32:30 +08:00
sunzhenyu
87c52581f2 修改三维设备贴图配置bug 2020-05-22 09:32:09 +08:00
joylink_cuiweidong
b371d02866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:08:36 +08:00
joylink_cuiweidong
16513c64d5 剧本编制代码调整 2020-05-22 09:07:39 +08:00
fan
1c9301a3d5 调整列车指令 2020-05-21 18:27:26 +08:00
zyy
fbe1da2a08 删除模块分析依赖 2020-05-21 17:52:07 +08:00
zyy
35eb28c4c9 过滤开发环境 2020-05-21 17:28:10 +08:00
zyy
7d68f74b8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 17:22:40 +08:00
zyy
c703e4affd 调整拆包模块化 2020-05-21 17:22:28 +08:00
fan
98f60b6d94 调整虚拟信号机侧向开放显示 2020-05-21 17:15:17 +08:00
fan
103ba6c139 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 17:03:43 +08:00
fan
4d9edad82b 调整加入创建列车菜单问题 2020-05-21 17:03:30 +08:00
joylink_cuiweidong
9dc0995e59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
2020-05-21 17:01:36 +08:00
joylink_cuiweidong
3a48755817 竞赛裁判系统代码调整 2020-05-21 16:59:36 +08:00
fan
aed5802b7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 16:53:59 +08:00
fan
a861e4908f 哈尔滨虚拟信号机调整 2020-05-21 16:53:39 +08:00
sunzhenyu
2e40e63e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 16:49:16 +08:00
sunzhenyu
e0fd1ece86 修改车站贴图,修改驾驶提示 2020-05-21 16:48:59 +08:00
fan
e4bdd9c829 调整西安一ats人工控显示调整 2020-05-21 16:34:05 +08:00
fan
311f81f601 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 15:58:50 +08:00
fan
503c51af10 西安一三宁波一福州一佛山延续保护区段闪烁 2020-05-21 15:58:23 +08:00
zyy
0dc5804886 调整打包相关 2020-05-21 15:51:56 +08:00
zyy
81973b6967 添加实操考试 结束生成分值流程 2020-05-21 15:18:00 +08:00
zyy
9827e8aae8 调整盈达 文件配置 2020-05-21 15:03:42 +08:00
zyy
9918678b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 14:59:29 +08:00
zyy
568ac44bf9 调整打包模式, 报名系统逻辑 2020-05-21 14:59:18 +08:00
fan
fa4c481d40 删除新建列车参数 2020-05-21 14:40:21 +08:00
fan
82adf8e241 西安三号线列车识别号修改 2020-05-21 14:21:04 +08:00
fan
34fba46cc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 13:16:36 +08:00
fan
96f5c31b18 新建列车调整 2020-05-21 13:16:20 +08:00
joylink_cuiweidong
b382b6e0d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 10:44:22 +08:00
joylink_cuiweidong
cf021736b2 竞赛裁判系统代码调整 2020-05-21 10:43:32 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
fan
6fc8d7edf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 09:31:29 +08:00