joylink_cuiweidong
|
c361b639ad
|
国际化调整
|
2019-11-01 17:30:06 +08:00 |
|
joylink_cuiweidong
|
96452b8dde
|
代码调整
|
2019-11-01 17:08:28 +08:00 |
|
zyy
|
a43f1bd2c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 15:19:22 +08:00 |
|
zyy
|
a133abc1d4
|
desc: 修改代码
|
2019-11-01 15:19:15 +08:00 |
|
joylink_cuiweidong
|
f3298cdb83
|
页面调整
|
2019-11-01 15:12:00 +08:00 |
|
zyy
|
3bcb637d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 13:51:08 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +08:00 |
|
joylink_cuiweidong
|
0c938f5928
|
接口调整
|
2019-11-01 13:36:14 +08:00 |
|
joylink_cuiweidong
|
ccd71601d1
|
接口调整
|
2019-11-01 11:28:10 +08:00 |
|
joylink_cuiweidong
|
444d60ce2a
|
接口调整
|
2019-11-01 10:28:15 +08:00 |
|
joylink_cuiweidong
|
76e904455a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 10:07:00 +08:00 |
|
joylink_cuiweidong
|
d0608dd29e
|
接口调整
文件位置调整
|
2019-11-01 10:06:47 +08:00 |
|
zyy
|
dd23ca545d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 18:43:19 +08:00 |
|
zyy
|
53d4483081
|
desc: 修改代码
|
2019-10-31 18:43:05 +08:00 |
|
joylink_cuiweidong
|
8035833c1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:45:28 +08:00 |
|
joylink_cuiweidong
|
cfdea6ea12
|
接口调整
|
2019-10-31 17:45:15 +08:00 |
|
zyy
|
7a0d40184f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:30:31 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
3ae1de5a23
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 16:56:31 +08:00 |
|
fan
|
7455fb17ea
|
发布地图管理国际化调整，添加ibp角色多人时disable为true 调整
|
2019-10-31 16:52:49 +08:00 |
|
joylink_cuiweidong
|
24a56a9695
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/views/lesson/lessoncategory/edit/lesson/index.vue
|
2019-10-31 16:11:29 +08:00 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +08:00 |
|
fan
|
a24ff9ad60
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:54:46 +08:00 |
|
fan
|
a914bdd8cb
|
ibp数据调整
|
2019-10-31 15:54:28 +08:00 |
|
zyy
|
834d4e30cd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 15:44:51 +08:00 |
|
zyy
|
ff4829e037
|
desc: 调整路径
|
2019-10-31 15:44:43 +08:00 |
|
ival
|
6df897316b
|
移植system
|
2019-10-31 15:43:37 +08:00 |
|
ival
|
07ef079f1b
|
修改代码
|
2019-10-31 15:34:38 +08:00 |
|
fan
|
0f6381e782
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:18:08 +08:00 |
|
fan
|
b9470b512e
|
ibp数据调整
|
2019-10-31 15:17:08 +08:00 |
|
zyy
|
dfd148897b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 14:47:20 +08:00 |
|
zyy
|
dc8524e52a
|
desc: 调整试题高度
|
2019-10-31 14:47:05 +08:00 |
|
fan
|
547589331b
|
发布地图管理调整调整
|
2019-10-31 14:35:28 +08:00 |
|
joylink_cuiweidong
|
50e74a0372
|
代码调整
|
2019-10-31 14:06:00 +08:00 |
|
fan
|
aefbd0f5e5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:58:01 +08:00 |
|
fan
|
934b67fea3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:57:36 +08:00 |
|
fan
|
3996f03e55
|
实训首页样式调整和复制地图调整
|
2019-10-31 13:57:17 +08:00 |
|
joylink_cuiweidong
|
c031125e97
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 13:56:53 +08:00 |
|
joylink_cuiweidong
|
681ac5e886
|
路由调整
接口调整
|
2019-10-31 13:56:42 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
joylink_cuiweidong
|
b5b08a0afd
|
接口调整
|
2019-10-31 11:03:19 +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 |
|
zyy
|
c006a98f2e
|
desc: 修改代码
|
2019-10-31 10:09:43 +08:00 |
|
zyy
|
fec1f776cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-31 09:22:01 +08:00 |
|
zyy
|
7175a4d917
|
desc: 调整代码
|
2019-10-31 09:21:31 +08:00 |
|
fan
|
6d37627e3d
|
发布地图管理调整
|
2019-10-31 09:09:43 +08:00 |
|
joylink_cuiweidong
|
3636bd06b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 19:37:07 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
fan
|
00dcbdf7bd
|
任务管理调整
|
2019-10-30 19:36:26 +08:00 |
|