Commit Graph

1785 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
343372d83a 设计平台地图三维路径调整 2019-10-21 16:12:03 +08:00
fan
04bebc8201 Merge remote-tracking branch 'origin/dev' into test 2019-10-21 16:08:07 +08:00
fan
81edd3c5c2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-21 16:07:28 +08:00
fan
b68dd99bde 仿真路由调整 2019-10-21 16:07:15 +08:00
joylink_cuiweidong
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
sunzhenyu
ca36aa478d 增加三维编辑 2019-10-21 14:29:45 +08:00
joylink_cuiweidong
c9ad0a8be5 自动登录页面处理 2019-10-21 14:14:22 +08:00
sunzhenyu
394baf72a7 模型测试 2019-10-21 14:09:19 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
7e7fc2256c Merge remote-tracking branch 'origin/dev' into test 2019-10-21 13:17:30 +08:00
fan
4b41c9fd27 考试路由调整 2019-10-21 13:16:49 +08:00
fan
be2bbc67cd 接口参数调整 2019-10-21 11:15:15 +08:00
fan
9ed65095cc 接口参数调整 2019-10-21 10:50:31 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
77d024c08c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/demonList.vue
2019-10-21 08:58:17 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
joylink_cuiweidong
fd4df4f178 设计平台地图列表页面调整 2019-10-18 18:35:17 +08:00
ival
94288eaecc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 18:31:29 +08:00
ival
36950a331e 修改比例 2019-10-18 18:31:14 +08:00
zyy
9087a33937 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 18:20:24 +08:00
zyy
74a2bbb1c6 desc: 调整成都三号现地,行调实训操作 2019-10-18 18:20:17 +08:00
joylink_cuiweidong
170c7bcc9e 课程设计界面参数调整 2019-10-18 18:13:54 +08:00
ival
0864369b35 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 17:54:10 +08:00
ival
9a14de60ef 修改电子显示屏 2019-10-18 17:53:57 +08:00
joylink_cuiweidong
ecef9a4c74 设计平台地图列表接口调整 2019-10-18 17:45:08 +08:00
fan
b23bff36f0 打开实训录制按钮 2019-10-18 17:32:14 +08:00
fan
911b8a9057 接口调整 2019-10-18 17:23:25 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
joylink_cuiweidong
1b342fee6e 地图列表获取城市列表样式调整 2019-10-18 16:57:40 +08:00
sunzhenyu
5c79ab8216 去掉辅助线 2019-10-18 15:43:00 +08:00
ival
5e83d06250 修改计时组件样式 2019-10-18 15:35:48 +08:00