Commit Graph

82 Commits

Author SHA1 Message Date
zyy
16e13f38b5 desc: 调整格式 2019-11-07 18:46:17 +08:00
joylink_cuiweidong
568e335a59 代码调整 2019-11-06 10:42:53 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
zyy
443051edc3 desc: 调整代码 2019-10-30 13:58:34 +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
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
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
60c58fe290 desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联 2019-10-28 18:42:31 +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
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
7ed9387731 更新发布课程信息
地图预览bug调整
2019-10-28 10:29:17 +08:00
joylink_cuiweidong
6df1eecfc3 代码调整 2019-10-25 16:33:35 +08:00
joylink_cuiweidong
5905f0ed63 国际化调整 2019-10-25 14:41:23 +08:00
joylink_cuiweidong
da7564402c 代码调整 2019-10-25 10:39:41 +08:00
joylink_cuiweidong
f597ce530f 已发布地图 地图预览
管理员 课程设计可见
2019-10-24 18:11:58 +08:00
joylink_cuiweidong
a1761fd2fc 添加copyRight 2019-10-23 19:15:02 +08:00
joylink_cuiweidong
f483a1c115 运行图审核接口调整 2019-10-23 17:41:24 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
2019-10-22 14:43:27 +08:00
joylink_cuiweidong
343372d83a 设计平台地图三维路径调整 2019-10-21 16:12:03 +08:00
fan
be2bbc67cd 接口参数调整 2019-10-21 11:15:15 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +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
joylink_cuiweidong
170c7bcc9e 课程设计界面参数调整 2019-10-18 18:13:54 +08:00
joylink_cuiweidong
ecef9a4c74 设计平台地图列表接口调整 2019-10-18 17:45:08 +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
zyy
7b5255c3eb desc: 调整格式化,样式 2019-10-17 18:27:49 +08:00
fan
f6e8375bf8 实训管理调整 2019-10-17 18:06:49 +08:00
joylink_cuiweidong
571e221413 用户剧本预览页面调整 2019-10-16 09:18:26 +08:00
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
joylink_cuiweidong
bf66b2c9e0 剧本发布申请页面调整 2019-10-12 11:11:34 +08:00
joylink_cuiweidong
e31bd2730f Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-10-10 16:18:43 +08:00
joylink_cuiweidong
17ed79b2dd 产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
2019-10-10 16:18:31 +08:00
fan
977a6d8b47 产品分化调整 2019-10-10 16:07:13 +08:00
joylink_cuiweidong
28ca25b822 处理设计平台菜单栏显示的问题 2019-10-09 14:56:32 +08:00
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00