Commit Graph

6459 Commits

Author SHA1 Message Date
joylink_cuiweidong
a554912c09 哈尔滨一号线教研机 行调切通号 按钮显示调整 2020-08-03 17:28:46 +08:00
joylink_cuiweidong
baf0fe4900 故障操作切换代码调整 2020-08-03 16:59:23 +08:00
fan
3c622b6fb5 调整仿真仿真状态 2020-08-03 16:55:05 +08:00
fan
82bfb02b97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 16:20:23 +08:00
fan
f23a3a8112 同步按计划行车时间 2020-08-03 16:20:14 +08:00
zyy
0f03eee53f 调整宁波道岔状态 2020-08-03 15:56:56 +08:00
zyy
057071769f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:32:20 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +08:00
fan
42d850de66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 15:27:26 +08:00
joylink_cuiweidong
753f7db809 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:27:20 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00
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
c9fc984bc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:23:00 +08:00
zyy
60986fbfeb 大屏修改 2020-08-03 15:22:46 +08:00
sunleking
9250606950 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 14:30:39 +08:00
sunleking
33ff32222d 修改三维通号和驾驶界面样式 2020-08-03 14:30:31 +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
1235126ac3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:30:36 +08:00
fan
278741e686 清除调用原有mutation-type 2020-08-03 10:30:28 +08:00
zyy
317ea995e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:16:23 +08:00
zyy
7ff4872a33 调整大屏遮罩宽度 2020-08-03 10:16:10 +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
176de3219f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 18:49:51 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
joylink_cuiweidong
88b03d240b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 17:30:43 +08:00
joylink_cuiweidong
5bb59c855e 佛山控制权转移代码调整 2020-07-31 17:30:26 +08:00
sunzhenyu
988f38fbb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:42:34 +08:00
sunzhenyu
44710199b7 修改三维行车初始绑定列车 2020-07-31 16:42:25 +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