zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +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 |
|
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
|
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 |
|
fan
|
50f87895c6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 18:30:45 +08:00 |
|
fan
|
78f9d58321
|
登录token存储修改
|
2019-10-25 18:30:23 +08:00 |
|
zyy
|
700ae4ad84
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 18:20:32 +08:00 |
|
zyy
|
18ad9e1faa
|
desc: 调整个人信息
|
2019-10-25 18:20:24 +08:00 |
|
joylink_cuiweidong
|
0f39f495af
|
发布地图管理页面添加更新城市
|
2019-10-25 17:50:55 +08:00 |
|
fan
|
73e9c995c2
|
综合演练房间快速入口添加线路
|
2019-10-25 17:49:44 +08:00 |
|
fan
|
d5b6f172e9
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-10-25 17:09:02 +08:00 |
|
fan
|
ceb7fa7e5e
|
西铁院运行图编制调整
|
2019-10-25 16:59:23 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +08:00 |
|
joylink_cuiweidong
|
6df1eecfc3
|
代码调整
|
2019-10-25 16:33:35 +08:00 |
|
fan
|
0c5fb4c6f4
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-25 14:43:00 +08:00 |
|
joylink_cuiweidong
|
5905f0ed63
|
国际化调整
|
2019-10-25 14:41:23 +08:00 |
|
zyy
|
32d3983d70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 14:34:19 +08:00 |
|
zyy
|
bced191397
|
desc: 增加以link为基础删除区段及相关道岔
|
2019-10-25 14:34:10 +08:00 |
|
joylink_cuiweidong
|
dc1c69fe16
|
已发布地图剧本列表页面调整
|
2019-10-25 14:14:27 +08:00 |
|
joylink_cuiweidong
|
ba7583cd1c
|
综合演练进入房间 没有输入发送文字禁用
|
2019-10-25 13:47:25 +08:00 |
|
fan
|
ca736a93f3
|
登录过期不显示获取子系统信息失败
|
2019-10-25 13:16:07 +08:00 |
|
fan
|
2e49c6499f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 13:00:04 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +08:00 |
|
joylink_cuiweidong
|
da7564402c
|
代码调整
|
2019-10-25 10:39:41 +08:00 |
|
zyy
|
6f4c8e02ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:28:15 +08:00 |
|
zyy
|
033c6f40fa
|
desc: 调整高度
|
2019-10-24 18:28:06 +08:00 |
|
fan
|
0c67d2a077
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 18:19:28 +08:00 |
|
fan
|
6fa98a6585
|
代码调整
|
2019-10-24 18:19:06 +08:00 |
|
joylink_cuiweidong
|
7530489fa5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:12:10 +08:00 |
|
joylink_cuiweidong
|
f597ce530f
|
已发布地图 地图预览
管理员 课程设计可见
|
2019-10-24 18:11:58 +08:00 |
|
fan
|
5a808c1cd4
|
语言切换调整
|
2019-10-24 16:50:45 +08:00 |
|
fan
|
237d821f33
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 16:46:49 +08:00 |
|
fan
|
2c729abb01
|
网页title和图标调整
|
2019-10-24 16:46:34 +08:00 |
|
zyy
|
08067bb4e8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Entry.vue
|
2019-10-24 15:32:40 +08:00 |
|
zyy
|
68560f0d37
|
desc: 增加修改个人信息弹窗
|
2019-10-24 15:31:29 +08:00 |
|
fan
|
fe68f93aea
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 15:16:10 +08:00 |
|
fan
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +08:00 |
|
joylink_cuiweidong
|
24ad2d65e3
|
代码调整
|
2019-10-24 14:41:00 +08:00 |
|
joylink_cuiweidong
|
e8b8d5a91d
|
菜单栏昵称样式调整
|
2019-10-24 14:32:44 +08:00 |
|