Commit Graph

139 Commits

Author SHA1 Message Date
joylink_cuiweidong
444d60ce2a 接口调整 2019-11-01 10:28:15 +08:00
joylink_cuiweidong
ad97697406 接口调整 2019-10-31 15:56:07 +08:00
zyy
a87372ea2c desc: 发布高度调整 2019-10-31 13:24:45 +08:00
fan
ea219e6310 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/publish/publishMap/index.vue
#	src/views/publish/publishMap/project.vue
2019-10-31 10:36:30 +08:00
fan
900abcbe36 添加复制地图和调整实训平台树节点key 2019-10-31 10:32:46 +08:00
joylink_cuiweidong
de76904dfc 接口调整 2019-10-30 19:36:29 +08:00
fan
0311e5ee4f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 18:18:32 +08:00
fan
1242c7e3d7 修改接口:/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId} 2019-10-30 18:18:09 +08:00
joylink_cuiweidong
2df4c5f8cb Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 18:07:45 +08:00
joylink_cuiweidong
ce0230150b 接口调整 2019-10-30 18:07:09 +08:00
fan
e5c832aa00 修改接口:/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list 2019-10-30 17:41:29 +08:00
fan
36c33ed416 修改接口:/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list 2019-10-30 17:21:32 +08:00
fan
0f778f94c6 所有 /api/mapSkin 开始的接口路径都改为 /api/realLine 2019-10-30 17:00:50 +08:00
fan
f2e4885f78 删除接口:/api/runPlan/draft/tree 2019-10-30 16:58:44 +08:00
fan
6d0edb2370 合并代码 2019-10-30 16:57:01 +08:00
fan
4918c78204 删除接口:/api/runPlan/draft/station/{skinCode}/bySkin 2019-10-30 16:50:35 +08:00
joylink_cuiweidong
de1b8d579e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/map/runplan/index.vue
2019-10-30 14:04:22 +08:00
joylink_cuiweidong
c80d2ed536 接口调整
多余文件删除
2019-10-30 14:00:50 +08:00
zyy
443051edc3 desc: 调整代码 2019-10-30 13:58:34 +08:00
fan
2107549d72 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:07:07 +08:00
fan
0489cf2fd3 删除接口:/api/map/{skinCode}/train 2019-10-30 11:18:41 +08:00
fan
f1ccb7438d 代码调整 2019-10-29 15:40:47 +08:00
fan
041d926b80 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/router/index.js
#	src/utils/baseUrl.js
2019-10-29 14:16:49 +08:00
fan
973168970c 西铁院项目调整 2019-10-29 14:14:14 +08:00
joylink_cuiweidong
b9111b8219 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
2019-10-28 19:14:49 +08:00
joylink_cuiweidong
9bd9e7fd8a 代码调整 2019-10-28 10:36:20 +08:00
joylink_cuiweidong
7ed9387731 更新发布课程信息
地图预览bug调整
2019-10-28 10:29:17 +08:00
joylink_cuiweidong
0f39f495af 发布地图管理页面添加更新城市 2019-10-25 17:50:55 +08:00
zyy
68560f0d37 desc: 增加修改个人信息弹窗 2019-10-24 15:31:29 +08:00
zyy
dd89b94e64 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/layout/components/Logout.vue
2019-10-24 09:47:57 +08:00
zyy
f24259c76d desc: 个人信息修改 2019-10-24 09:46:58 +08:00
fan
8710a6231a 综合演练房间调整 2019-10-23 16:13:36 +08:00
joylink_cuiweidong
b26ab2fc15 删除地图系统接口调整以及西铁院系统tree接口调整 2019-10-22 15:13:58 +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
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
joylink_cuiweidong
c9ad0a8be5 自动登录页面处理 2019-10-21 14:14:22 +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
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
fan
0ebab6201f Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
#	src/views/scriptManage/home.vue
2019-10-17 18:09:02 +08:00
joylink_cuiweidong
99b2cfc05b 剧本预览页面调整 2019-10-17 18:06:04 +08:00
fan
534fa388e8 添加子系统生成页面 2019-10-17 17:11:15 +08:00
joylink_cuiweidong
a264ab51cb 已发布地图剧本列表页面调整 2019-10-17 10:06:52 +08:00