Commit Graph

1397 Commits

Author SHA1 Message Date
joylink_cuiweidong
5c8ca28b52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:25:31 +08:00
joylink_cuiweidong
e7ba329194 哈尔滨一号线 菜单隐藏 代码调整 2020-08-03 15:25:12 +08:00
zyy
60986fbfeb 大屏修改 2020-08-03 15:22:46 +08:00
zyy
f0c623e743 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 14:13:09 +08:00
zyy
31be09323b 调整综合演练顶部菜单判断,增加哈尔滨项目 行调设备登陆显示指令模式 2020-08-03 14:12:56 +08:00
joylink_cuiweidong
c309859c2b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 13:27:56 +08:00
joylink_cuiweidong
ca987254c7 新版地图仿真时间问题调整 2020-08-03 13:27:17 +08:00
zyy
5b92e9125d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:55:59 +08:00
zyy
1ade7ba9b8 调整样式 2020-08-03 10:55:43 +08:00
joylink_cuiweidong
f0d0c96f44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:54:01 +08:00
joylink_cuiweidong
56b6c422f9 新版地图课程考试计时代码调整 2020-08-03 10:53:44 +08:00
fan
278741e686 清除调用原有mutation-type 2020-08-03 10:30:28 +08:00
fan
94f70eea65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:02:24 +08:00
fan
d1a5669999 运行图预览初始化调整 2020-08-03 10:02:12 +08:00
zyy
b1fb2a12dc 调整样式 2020-08-03 09:53:34 +08:00
joylink_cuiweidong
f8c542354c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 09:19:01 +08:00
joylink_cuiweidong
d397f437fd 剧本录制文件位置调整 2020-08-03 09:18:27 +08:00
fan
517270b2f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 18:57:46 +08:00
fan
3215bec260 运行图调整 2020-07-31 18:57:27 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
350bfab719 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:20:30 +08:00
joylink_cuiweidong
cb6d891d2b 代码调整 2020-07-31 16:20:07 +08:00
fan
b82f701e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 16:15:33 +08:00
fan
7be510605f 取消综合仿真观众暂不关闭三维驾驶 2020-07-31 16:14:33 +08:00
joylink_cuiweidong
48cd28bd88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:03:48 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
fan
06ed0a6f76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 15:53:36 +08:00
fan
deb60acd14 绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整 2020-07-31 15:53:25 +08:00
zyy
d15328de57 调整地图绘制流程 2020-07-31 15:24:44 +08:00
zyy
f1d72d0968 调整综合演练流程 2020-07-30 18:42:41 +08:00
zyy
a7144dd4da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 17:49:34 +08:00
zyy
e4c20b1bf8 调整老版地图绘制文件位置 2020-07-30 17:49:20 +08:00
joylink_cuiweidong
8663a4fba0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 16:45:22 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +08:00
fan
0a7d3d97bd 调整剧本会话@ 2020-07-30 16:33:08 +08:00
fan
71d3ff5d87 调整驾驶终端进入跳转 2020-07-30 15:58:28 +08:00
zyy
48491044ce 调整列表样式 2020-07-30 15:32:39 +08:00
zyy
1ed90362c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:10:26 +08:00
zyy
a6feabd406 调整地图绘制逻辑 2020-07-30 15:10:10 +08:00
fan
955ad3a89d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 13:46:55 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
joylink_cuiweidong
2408797a04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 11:09:25 +08:00
joylink_cuiweidong
31a2854a15 运行图预览运行列车颜色代码调整 2020-07-30 11:08:59 +08:00
fan
c741783ea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 18:27:19 +08:00
fan
95e4479d04 考试设备定位调整 2020-07-29 18:26:58 +08:00
zyy
841946ce29 调整按钮样式 2020-07-29 17:41:19 +08:00
zyy
0110502711 删除多余注释 2020-07-29 16:59:57 +08:00
fan
2648ed6a4a 仿真会话调整 2020-07-29 16:24:51 +08:00