Commit Graph

1917 Commits

Author SHA1 Message Date
joylink_cuiweidong
7550d82f2b 登录修改 2019-10-22 20:09:29 +08:00
fan
332fa22b81 登录配置调整 2019-10-22 20:04:55 +08:00
fan
48fafacdc2 获取上次用户登录系统 2019-10-22 20:01:03 +08:00
fan
01cf337b63 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 19:49:59 +08:00
fan
21510d9464 创建章节修改 2019-10-22 19:49:37 +08:00
program-walker
6fa2b2e636 登陆逻辑修改 2019-10-22 19:47:36 +08:00
fan
5c5c2412fd 章节下添加创建章节 2019-10-22 19:23:01 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
sunzhenyu
5aa564d00a 修改驾驶模型渲染范围,修改行车速度 2019-10-22 18:35:56 +08:00
fan
4bd232bd67 地图系统结构调整 2019-10-22 18:34:05 +08:00
fan
4f14075072 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 18:20:10 +08:00
joylink_cuiweidong
2bd13ad075 实训tree 样式调整 2019-10-22 18:19:18 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
sunzhenyu
c7cb769c1a Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-10-22 17:42:20 +08:00
sunzhenyu
61b9c9705c 设置模型路径 2019-10-22 17:33:17 +08:00
fan
6760cdc7e3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 17:24:51 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
zyy
ac35d9dbfd Merge branch 'dev' into test 2019-10-22 16:29:50 +08:00
zyy
d97c1096b0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 16:29:19 +08:00
zyy
83c53b0640 desc: 修改代码 2019-10-22 16:29:11 +08:00
joylink_cuiweidong
a160c19a3d Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-10-22 16:13:27 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test
# Conflicts:
#	src/utils/baseUrl.js
2019-10-22 16:13:13 +08:00
joylink_cuiweidong
2282f27239 设计系统运行图样式调整 2019-10-22 16:10:39 +08:00
fan
6f314ba150 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 16:06:20 +08:00
fan
0e23a62b39 调整代码 2019-10-22 16:05:58 +08:00
zyy
0eb05638a0 desc: 调整列车识别号初始化 2019-10-22 15:42:07 +08:00
sunzhenyu
dcd5c7bf1e Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-10-22 15:41:51 +08:00
sunzhenyu
388d647ba3 修改通信消息判断顺序 2019-10-22 15:41:39 +08:00
zyy
8f01ed2e57 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 15:24:43 +08:00
zyy
3c67e18350 desc: 修改代码 2019-10-22 15:24:36 +08:00
joylink_cuiweidong
c08064faa0 Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-10-22 15:14:54 +08:00
joylink_cuiweidong
b26ab2fc15 删除地图系统接口调整以及西铁院系统tree接口调整 2019-10-22 15:13:58 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
2019-10-22 14:43:27 +08:00
fan
e89211a873 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 14:28:41 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
2eb3dc9842 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 14:07:27 +08:00
zyy
a61f917f4a desc: 调整站台扣车状态显示 2019-10-22 14:07:20 +08:00
fan
6d665acbb5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 13:51:17 +08:00
fan
089e45bf33 实训录制演示功能调整 2019-10-22 13:50:58 +08:00
zyy
ac0fafebc0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 13:41:29 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
b7a16a9074 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 13:40:55 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
joylink_cuiweidong
7785b9a9af 设计平台 系统管理 子系统 修改接口以及国际化 2019-10-22 11:20:43 +08:00
joylink_cuiweidong
c04abcc67a 设计平台 系统管理 子系统 创建子系统接口调整 2019-10-22 09:36:37 +08:00
joylink_cuiweidong
9fcdda5d60 设计平台 系统管理 子系统 创建子系统接口 2019-10-21 18:03:13 +08:00
sunzhenyu
b5a822afea 增加webworker停止 2019-10-21 17:59:48 +08:00
sunzhenyu
3c9f448419 Merge branch '3dtest' into test 2019-10-21 16:52:01 +08:00
sunzhenyu
bd683656a8 Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-10-21 16:51:09 +08:00
sunzhenyu
71d9ea6151 修改三维编辑 2019-10-21 16:16:34 +08:00