Commit Graph

8181 Commits

Author SHA1 Message Date
fan
d96df1ce68 个人信息关闭后终止状态&贵装备展示留言板 2020-12-02 15:23:23 +08:00
joylink_cuiweidong
84d7d145c2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 14:25:40 +08:00
joylink_cuiweidong
caeb8aa457 福州一号线新版 配置文件调整 2020-12-02 14:25:20 +08:00
fan
706c2343a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 14:22:53 +08:00
fan
d8f8acfe02 单位调整&哈尔滨区段限速调整 2020-12-02 14:22:26 +08:00
zyy
ccd6e4ef74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 09:31:39 +08:00
zyy
de081382fa 增加运行图交路设置 2020-12-02 09:31:23 +08:00
fan
422ed21415 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 19:00:37 +08:00
fan
9c06b3ed27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 18:50:32 +08:00
fan
4ac37c5d18 单位调整 2020-12-01 18:50:23 +08:00
joylink_cuiweidong
dd50c9ac58 删除购买按钮 删除暂时无用的文件 2020-12-01 18:47:47 +08:00
joylink_cuiweidong
eb8f171bdd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 17:22:39 +08:00
joylink_cuiweidong
941f57e02c 代码调整 2020-12-01 17:20:44 +08:00
fan
ab7ff394ce 单位调整 2020-12-01 15:20:34 +08:00
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