Commit Graph

1801 Commits

Author SHA1 Message Date
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
85733f5f0a 接口调整
无效文件删除
2019-10-30 14:40:31 +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
375773cceb 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:56:43 +08:00
fan
b6f11064da Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 13:07:27 +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
zyy
850f492b45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 10:15:24 +08:00
zyy
6aa05c217f desc: 修改代码 2019-10-30 10:15:18 +08:00
joylink_cuiweidong
81921a4a0d 国际化调整 2019-10-30 09:58:23 +08:00
joylink_cuiweidong
e8cacb4a84 样式调整 2019-10-29 18:55:10 +08:00
fan
b9f4f15601 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-29 18:36:46 +08:00
fan
e2e1411b23 国际化调整 2019-10-29 18:36:16 +08:00
zyy
3fa60b2e8b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/ConstDic.js
#	src/views/lesson/lessoncategory/edit/sorttree/index.vue
#	src/views/lesson/lessoncategory/index.vue
#	src/views/login/index.vue
2019-10-29 17:36:48 +08:00
zyy
df8d104bd1 desc: 高度修改,登陆页面英文调整 2019-10-29 17:33:11 +08:00
joylink_cuiweidong
c45b991c22 代码调整 2019-10-29 16:49:48 +08:00
joylink_cuiweidong
462b0cfb6c 样式调整 2019-10-29 16:23:57 +08:00
joylink_cuiweidong
e3dccd58c8 地图设计样式调整 2019-10-29 15:48:38 +08:00
fan
f1ccb7438d 代码调整 2019-10-29 15:40:47 +08:00
fan
a6b0caab34 西铁院调整 2019-10-29 15:06:15 +08:00
fan
27317bf24a 西铁院调整 2019-10-29 14:41: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
b1c3e10eb1 课程设计内容排序样式调整 2019-10-29 13:43:23 +08:00
zyy
0222dfe5c2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-29 13:16:04 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +08:00
joylink_cuiweidong
9fc78c18c3 课程设计内容排序调整
运行图发布弹出提示调整
2019-10-29 13:06:55 +08:00
joylink_cuiweidong
8ad40cf998 代码调整 2019-10-29 09:43:56 +08:00
joylink_cuiweidong
7246568801 代码调整 2019-10-28 19:16:07 +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
b5a8b10e4e 剧本预览接口调整 2019-10-28 19:12:31 +08:00
zyy
d056b8bfc8 desc: 调整个人信息修改接口参数 2019-10-28 19:01:29 +08:00
zyy
60c58fe290 desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联 2019-10-28 18:42:31 +08:00
fan
b8834f5bb4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-28 18:36:26 +08:00
zyy
8e71ff7287 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/demonList.vue
2019-10-28 17:53:39 +08:00
zyy
178e49187d desc: 调整高度自适应, 调整地图绘制创建区段,道岔逻辑优化 2019-10-28 17:51:59 +08:00
fan
42cdacbcd0 西铁院项目路由调整 2019-10-28 17:08:22 +08:00
joylink_cuiweidong
538e3e0697 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/demonList.vue
#	src/views/designPlatform/mapPreview.vue
2019-10-28 15:12:08 +08:00
joylink_cuiweidong
7ee5cbcab3 代码调整 2019-10-28 15:00:50 +08:00
zyy
ab9d300e2e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
2019-10-28 11:08:50 +08:00
zyy
285b80ffb7 desc: 调整检测高度问题 2019-10-28 11:07:33 +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
fan
9c99b2f451 queryform 调整 2019-10-28 10:26:33 +08:00