Commit Graph

8217 Commits

Author SHA1 Message Date
sunzhenyu
42e37af6ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 10:27:15 +08:00
sunzhenyu
5911e330bf 限制三维客流镜头移动 2020-12-01 10:27:02 +08:00
sunzhenyu
01993cf65e 修改三维客流人物坐动画,修改重置动作bug 2020-12-01 10:26:15 +08:00
zyy
b93af93af3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 10:21:06 +08:00
zyy
20e774c8b8 删除多余配置 2020-12-01 10:20:54 +08:00
fan
388f9a14ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-30 18:25:41 +08:00
fan
97a373b9d9 代码调整 2020-11-30 18:22:22 +08:00
joylink_cuiweidong
798d4589cf 代码调整 2020-11-30 18:06:32 +08:00
joylink_cuiweidong
888001c65e 删除暂时无用代码 2020-11-30 16:12:24 +08:00
joylink_cuiweidong
19d1a6e0b1 设计平台 用户实训管理 用户仿真管理 代码调整 2020-11-30 13:56:42 +08:00
joylink_cuiweidong
572dc1b3bd 实训平台 地图列表 代码调整 2020-11-30 11:14:52 +08:00
joylink_cuiweidong
706335aadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-30 10:23:47 +08:00
joylink_cuiweidong
f9bac6886a 删除暂时无用代码 2020-11-30 10:23:32 +08:00
sunzhenyu
e44138953a merge 2020-11-30 10:14:24 +08:00
sunzhenyu
cbc7a2d3fe 修改三维客流列车人物动画 2020-11-30 09:57:38 +08:00
sunleking
bf1377fc27 修改三维客流列车乘员更新bug 2020-11-27 21:39:06 +08:00
joylink_cuiweidong
afa5b72281 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 18:37:24 +08:00
joylink_cuiweidong
6fadd63dfd 代码调整 2020-11-27 18:37:07 +08:00
sunzhenyu
e26c6dc080 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 18:20:14 +08:00
sunzhenyu
c243303e74 修改三维模块获取站场图数据接口 2020-11-27 18:20:06 +08:00
fan
360973274c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 18:10:16 +08:00
fan
f824b15bc1 退出按钮展示条件判断 2020-11-27 18:09:58 +08:00
sunzhenyu
dda3cedf30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:50:39 +08:00
sunzhenyu
7491a63b42 三维客流退出样式 2020-11-27 17:50:33 +08:00
joylink_cuiweidong
34424f11a0 地图缓存代码调整 2020-11-27 17:49:21 +08:00
joylink_cuiweidong
6a9406054d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:37:30 +08:00
joylink_cuiweidong
c1507b01e1 地图数据加载到缓存store里(刷新之后数据会丢失)
删除暂时无用的代码
2020-11-27 17:37:13 +08:00
sunzhenyu
7068b73585 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:25:02 +08:00
sunzhenyu
c8cdf34397 修改三维客流退出页面取消订阅 2020-11-27 17:24:52 +08:00
zyy
ef45842dfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 16:26:53 +08:00
zyy
900064a767 调整福州线路实训操作 2020-11-27 16:26:42 +08:00
joylink_cuiweidong
b3f538fa09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 15:04:15 +08:00
joylink_cuiweidong
93e936a766 北交大 客流项目代码调整 2020-11-27 15:03:55 +08:00
fan
056570c096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:18:42 +08:00
fan
76f9db3eb6 留言板添加至新标签页
(cherry picked from commit a509af1e09)
2020-11-27 14:17:54 +08:00
zyy
eabb4b8782 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:15:32 +08:00
zyy
6b8bfffd21 调整限速实训流程 2020-11-27 14:15:19 +08:00
joylink_cuiweidong
90ec120603 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:05:28 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
sunzhenyu
c3a8ab7929 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:00:05 +08:00
sunzhenyu
c2f2698092 修改三维客流窗口操作 2020-11-27 13:59:54 +08:00
zyy
032c3036b8 调整国赛系统样式名称 2020-11-27 09:22:25 +08:00
joylink_cuiweidong
1f7c3f3bf7 宁波一号线 人解进路更换指令(之前为信号机取消引导,换为人解进路) 2020-11-26 18:52:53 +08:00
joylink_cuiweidong
3132506382 宁波一号线 取消进路 指令 换成 总取消 2020-11-26 18:21:57 +08:00
joylink_cuiweidong
2dad05d63f 福州一号线 西安三号线 实训定义代码调整 2020-11-26 17:22:49 +08:00
joylink_cuiweidong
00e60e877c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 16:43:23 +08:00
joylink_cuiweidong
d1eec65783 西安三号线 福州一号线 实训定义代码调整 2020-11-26 16:43:00 +08:00
sunzhenyu
9794e37274 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:52:58 +08:00
fan
43c0de245d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:54:58 +08:00
fan
5abdfc9883 哈尔滨操作调整 2020-11-26 14:54:37 +08:00