Commit Graph

170 Commits

Author SHA1 Message Date
zyy
ca4a4689fc 调整大屏偏移 2020-05-07 09:04:28 +08:00
fan
81c6b76485 大屏调整 2020-05-07 09:03:10 +08:00
fan
997b962851 大屏禁用拖拽 2020-05-06 17:18:06 +08:00
fan
22fffd340f 大屏测试 2020-05-06 16:57:07 +08:00
fan
1bfe76c291 添加西安地铁页面&&项目配置规整(未完) 2020-04-16 13:47:40 +08:00
joylink_cuiweidong
eadcf233b1 设计平台 地图列表样式调整 2020-04-15 15:42:47 +08:00
joylink_cuiweidong
fec4e33719 实训平台和设计平台 地图列表代码调整 2020-04-15 15:06:51 +08:00
joylink_cuiweidong
518fc37db6 设计平台 公共地图 已发布地图列表 代码调整 2020-04-15 13:21:29 +08:00
fan
ba759b1d77 哈尔滨本地项目调整 2020-04-03 13:33:33 +08:00
fan
e35149248d 调整本地项目 2020-03-31 15:11:20 +08:00
joylink_cuiweidong
52dd666430 新版公共地图预览代码调整 2020-03-30 15:26:47 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
joylink_cuiweidong
d4279dd03a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 11:31:53 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
zyy
faf772712c 调整增加自动生成实训操作步骤 2020-03-27 11:24:47 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
b7d5edfb31 轮播页面调整 2019-12-24 09:09:30 +08:00
zyy
6e7ad61b4a 调整新版地图,旧版地图在公共地图显示流程 2019-12-23 10:36:32 +08:00
sunzhenyu
4b3bb2c142 merge 2019-12-03 13:50:24 +08:00
joylink_cuiweidong
927f7afb88 设计平台首页轮播图片修改 2019-11-22 14:37:30 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
joylink_cuiweidong
a27d8f4c1d 代码调整 2019-11-15 17:15:41 +08:00
joylink_cuiweidong
950ca18082 代码调整 2019-11-14 17:03:44 +08:00
joylink_cuiweidong
83ebe5eae9 设计平台轮播页面图片替换 2019-11-12 15:52:11 +08:00
joylink_cuiweidong
d2354b602f 具体线路下的skinCode修改 2019-11-12 15:39:18 +08:00
joylink_cuiweidong
5ce2e1a5b7 仿真skinCode调整 2019-11-12 13:39:52 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
fan
75a871265e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-08 16:22:32 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
joylink_cuiweidong
11226b84ab 运行图设计代码调整 2019-11-08 14:35:58 +08:00
joylink_cuiweidong
713f411ffc 运行图设计调整 2019-11-08 13:47:51 +08:00
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
joylink_cuiweidong
ec4e78548f 产品分化页面调整 2019-10-08 16:09:18 +08:00
joylink_cuiweidong
cad6eeb98e 产品分化 删除地图调整 2019-09-30 16:00:52 +08:00
joylink_cuiweidong
4fb174f185 产品分化 创建运行图调整 2019-09-30 14:17:20 +08:00
fan
2be7de7527 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/api/designPlatform.js
2019-09-30 13:26:13 +08:00
fan
5d27847379 设计平台系统调整 2019-09-30 13:24:47 +08:00
joylink_cuiweidong
c7b5188d74 产品分化 设计平台调整 2019-09-30 10:46:29 +08:00
joylink_cuiweidong
2e1f6739eb 产品分化调整 2019-09-29 16:54:11 +08:00
joylink_cuiweidong
53a9dc5feb Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-29 15:57:33 +08:00
joylink_cuiweidong
8d4bf59c34 产品分化调整 2019-09-29 15:57:19 +08:00
fan
c9570a4631 暂时提交 2019-09-29 15:55:01 +08:00
fan
dae0ceff57 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 15:38:38 +08:00
joylink_cuiweidong
0aa02cc85c 产品分化 地图右键操作调整 2019-09-29 15:25:23 +08:00