joylink_cuiweidong
|
fce7f5403a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:38:15 +08:00 |
|
ival
|
ed7acb5abe
|
修改目录大小写
|
2019-11-19 13:11:52 +08:00 |
|
joylink_cuiweidong
|
1877931ebb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:04:25 +08:00 |
|
zyy
|
ec711c2a7f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:00:47 +08:00 |
|
zyy
|
4144621be8
|
desc: 修改代码
|
2019-11-19 13:00:36 +08:00 |
|
ival
|
966dc20c3d
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-11-19 11:01:54 +08:00 |
|
ival
|
0186f25a2b
|
Merge branch 'dev' into test
# Conflicts:
# src/api/jlmap3d/load3ddata.js
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
|
2019-11-19 11:00:13 +08:00 |
|
ival
|
306d8b305f
|
修改代码
|
2019-11-19 10:54:52 +08:00 |
|
joylink_cuiweidong
|
133899b699
|
综合演练房间样式调整
|
2019-11-18 17:11:40 +08:00 |
|
joylink_cuiweidong
|
f68cb84648
|
代码调整
|
2019-11-18 15:42:05 +08:00 |
|
zyy
|
5a9099aa35
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 15:22:23 +08:00 |
|
zyy
|
9759950df0
|
desc: 增加区段实际长度
|
2019-11-18 15:22:16 +08:00 |
|
joylink_cuiweidong
|
98b32d1eae
|
代码修改
|
2019-11-18 15:07:22 +08:00 |
|
ival
|
5a4f6f5999
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 14:44:13 +08:00 |
|
ival
|
50e9a242e7
|
修改代码
|
2019-11-18 14:44:01 +08:00 |
|
zyy
|
7938876d85
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/GlobalPlugin.js
|
2019-11-18 14:30:25 +08:00 |
|
zyy
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
joylink_cuiweidong
|
68d13d935f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-18 14:29:03 +08:00 |
|
joylink_cuiweidong
|
a1ff86bd05
|
代码调整
|
2019-11-18 14:01:06 +08:00 |
|
joylink_cuiweidong
|
744bd60d9e
|
代码调整
|
2019-11-18 12:28:08 +08:00 |
|
ival
|
72d7fc96ea
|
修改代码
|
2019-11-18 10:34:18 +08:00 |
|
joylink_cuiweidong
|
78761243e4
|
剧本预览选择角色代码调整
|
2019-11-18 09:43:07 +08:00 |
|
joylink_cuiweidong
|
d0d2355367
|
实训平台仿真页面代码调整
|
2019-11-18 09:18:07 +08:00 |
|
ival
|
819305bc37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-15 19:23:08 +08:00 |
|
ival
|
f2dd239467
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 19:08:01 +08:00 |
|
ival
|
88007ba56b
|
修改代码
|
2019-11-15 19:07:46 +08:00 |
|
fan
|
2f14f10880
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 18:26:48 +08:00 |
|
fan
|
316fbce8e9
|
创建万能权限添加限制需添加一个以上权限
|
2019-11-15 18:26:35 +08:00 |
|
sunzhenyu
|
f7b909f85d
|
修改连接
|
2019-11-15 17:24:13 +08:00 |
|
joylink_cuiweidong
|
a27d8f4c1d
|
代码调整
|
2019-11-15 17:15:41 +08:00 |
|
sunzhenyu
|
495cecb06c
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-15 16:47:47 +08:00 |
|
sunzhenyu
|
3138187c07
|
减少合并三维行车判断逻辑，分拆三维行车数据对象
|
2019-11-15 16:47:34 +08:00 |
|
fan
|
1c75c8f0ef
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
# src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
|
2019-11-15 16:42:32 +08:00 |
|
fan
|
358c185e19
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 16:38:32 +08:00 |
|
fan
|
f03b3b6248
|
权限管理调整
|
2019-11-15 16:38:12 +08:00 |
|
ival
|
d599e561f6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/exam.js
# src/utils/baseUrl.js
# src/views/display/menuExam.vue
|
2019-11-15 16:34:54 +08:00 |
|
zyy
|
9a82914c11
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:31:55 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
ival
|
ecc76fa5aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:29:24 +08:00 |
|
ival
|
a60b41398b
|
修改代码
|
2019-11-15 16:29:11 +08:00 |
|
joylink_cuiweidong
|
a6797dbe85
|
运行图设计样式调整
|
2019-11-15 15:45:40 +08:00 |
|
joylink_cuiweidong
|
62599dd838
|
运行图设计点击车次号高亮调整
|
2019-11-15 14:33:03 +08:00 |
|
joylink_cuiweidong
|
859fbe5e4e
|
修改实训平台考试系统列表按钮显示
|
2019-11-15 11:40:49 +08:00 |
|
fan
|
d2b296153a
|
权限分发管理增加搜索条件，试题列表改为试卷列表
|
2019-11-15 10:53:13 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +08:00 |
|
zyy
|
63d89a71b1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/schedule.vue
|
2019-11-14 17:06:53 +08:00 |
|
zyy
|
b189b64650
|
修改element版本 调整高度样式
|
2019-11-14 17:06:00 +08:00 |
|
joylink_cuiweidong
|
52c4d0e08d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 17:03:54 +08:00 |
|
joylink_cuiweidong
|
950ca18082
|
代码调整
|
2019-11-14 17:03:44 +08:00 |
|
ival
|
c362d64048
|
修改代码
|
2019-11-14 16:45:31 +08:00 |
|
ival
|
6d23cedbf4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:18:33 +08:00 |
|
ival
|
29ceb9d376
|
修改代码
|
2019-11-14 16:18:19 +08:00 |
|
joylink_cuiweidong
|
fe23a03e69
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/permission.js
|
2019-11-14 15:59:32 +08:00 |
|
joylink_cuiweidong
|
595747be2a
|
代码调整
|
2019-11-14 15:54:58 +08:00 |
|
zyy
|
db24914ee7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 14:10:26 +08:00 |
|
zyy
|
558f359c77
|
删除elementui 改用cdn方式加载
|
2019-11-14 14:10:20 +08:00 |
|
ival
|
6ce30aaee2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
# src/permission.js
# src/views/display/demon/chartView.vue
# src/views/display/demon/chatBox.vue
# src/views/exam/detail/courseDetail.vue
|
2019-11-14 14:03:41 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +08:00 |
|
zyy
|
f31026608a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 13:06:31 +08:00 |
|
zyy
|
9b7b1d7bc8
|
删除不用文件
|
2019-11-14 13:06:24 +08:00 |
|
fan
|
e41d324c27
|
删除实训平台运行图编辑，修改综合演练值班员角色调整问题
|
2019-11-14 11:30:32 +08:00 |
|
joylink_cuiweidong
|
6fcba825f2
|
运行图设计代码调整
|
2019-11-14 10:50:11 +08:00 |
|
fan
|
3f69644b11
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 09:02:32 +08:00 |
|
fan
|
38c002166d
|
分发转增日期不能选择今天之前
|
2019-11-14 09:02:18 +08:00 |
|
joylink_cuiweidong
|
9d8a3270d8
|
权限转赠代码调整
|
2019-11-13 14:57:08 +08:00 |
|
fan
|
1cb0383aac
|
暂时注销个人权限管理页面的权限打包功能
|
2019-11-13 14:42:59 +08:00 |
|
fan
|
6bb95775b3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Navbar.vue
|
2019-11-13 14:31:56 +08:00 |
|
fan
|
bd2e82c0ea
|
权限分发转赠归属人查询 & 其他问题调整
|
2019-11-13 14:29:20 +08:00 |
|
joylink_cuiweidong
|
a5a2d79e64
|
综合演练ibp盘返回代码调整
|
2019-11-13 14:16:59 +08:00 |
|
joylink_cuiweidong
|
eb7b9a2edd
|
代码调整
|
2019-11-13 11:17:46 +08:00 |
|
ival
|
0c3a91319d
|
修改代码
|
2019-11-13 11:10:15 +08:00 |
|
ival
|
559a765d27
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 10:16:52 +08:00 |
|
ival
|
3fefbe2a47
|
修改代码
|
2019-11-13 10:15:54 +08:00 |
|
joylink_cuiweidong
|
f1075d74b1
|
代码调整
|
2019-11-12 18:31:16 +08:00 |
|
joylink_cuiweidong
|
96dead378a
|
剧本录制添加行调和现地切换
|
2019-11-12 17:58:45 +08:00 |
|
ival
|
8fb45d91a0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 17:28:44 +08:00 |
|
ival
|
8eb4ac80a6
|
修改刷新问题
|
2019-11-12 17:27:30 +08:00 |
|
zyy
|
9cf4fc7c2f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/beijing_01/planSchedule/schedule.vue
# src/jmap/theme/chengdu_03/planSchedule/schedule.vue
# src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
|
2019-11-12 17:26:25 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +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 |
|
ival
|
ff6c1c67c4
|
修改房间布局错误的bug
|
2019-11-12 14:56:53 +08:00 |
|
ival
|
79219792c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:44:30 +08:00 |
|
ival
|
89239b7fe1
|
修改代码
|
2019-11-12 13:44:10 +08:00 |
|
joylink_cuiweidong
|
b1d19febe6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:40:05 +08:00 |
|
joylink_cuiweidong
|
5ce2e1a5b7
|
仿真skinCode调整
|
2019-11-12 13:39:52 +08:00 |
|
zyy
|
092603c2cc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:36:27 +08:00 |
|
zyy
|
7018b4c308
|
desc: 修改代码
|
2019-11-12 13:36:21 +08:00 |
|
fan
|
52e3bfe38a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-12 09:40:57 +08:00 |
|
fan
|
92f2292592
|
暂无法购买，添加提示
|
2019-11-12 09:40:36 +08:00 |
|
ival
|
dfa6c7bf37
|
修改代码
|
2019-11-12 09:30:31 +08:00 |
|
ival
|
1d0a920f7c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 09:24:26 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
zyy
|
e9ef8efa17
|
Merge branch 'dev' into test
|
2019-11-11 19:29:31 +08:00 |
|
zyy
|
db1681b54e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 19:24:39 +08:00 |
|
zyy
|
6e29cec983
|
desc: 修改代码
|
2019-11-11 19:24:30 +08:00 |
|
fan
|
154e15b428
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 18:53:41 +08:00 |
|
fan
|
e069821071
|
路由跳转调整
|
2019-11-11 18:53:11 +08:00 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|
fan
|
90a45dc5bd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-11 18:42:34 +08:00 |
|
fan
|
c35cef4800
|
样式调整
|
2019-11-11 18:42:14 +08:00 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
joylink_cuiweidong
|
9851ac01a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 17:39:23 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
joylink_cuiweidong
|
4c0f965a47
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 15:54:15 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
fan
|
6ca155617f
|
label 调整
|
2019-11-11 14:08:54 +08:00 |
|
fan
|
04ec094ded
|
样式调整
|
2019-11-11 13:34:35 +08:00 |
|
fan
|
bf7b12cacb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/lesson/trainingmanage/index.vue
|
2019-11-11 13:23:35 +08:00 |
|
fan
|
907d95879e
|
代码调整
|
2019-11-11 13:22:22 +08:00 |
|
joylink_cuiweidong
|
b3a4e6ca8c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/global.js
|
2019-11-11 13:11:50 +08:00 |
|
fan
|
56d11976db
|
设计平台剧本课程运行图统一风格样式
|
2019-11-11 13:10:36 +08:00 |
|
joylink_cuiweidong
|
aade09a303
|
权限分发调整
|
2019-11-11 13:10:23 +08:00 |
|
fan
|
be6bd12b52
|
代码调整
|
2019-11-11 09:56:11 +08:00 |
|
fan
|
30f1997a08
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 20:31:10 +08:00 |
|
fan
|
00458ff53f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 20:25:26 +08:00 |
|
fan
|
46c6282a14
|
代码调整
|
2019-11-08 20:25:04 +08:00 |
|
ival
|
62097db613
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 20:04:32 +08:00 |
|
ival
|
8855bb6c27
|
修改代码
|
2019-11-08 20:03:33 +08:00 |
|
ival
|
1e1400ac68
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 19:33:05 +08:00 |
|
ival
|
b049ff3be2
|
修改代码
|
2019-11-08 19:32:21 +08:00 |
|
joylink_cuiweidong
|
d64e838bcb
|
代码调整
|
2019-11-08 19:29:39 +08:00 |
|
joylink_cuiweidong
|
8f0ef88f59
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 18:58:03 +08:00 |
|
joylink_cuiweidong
|
fcf4f542e0
|
代码调整
|
2019-11-08 18:57:27 +08:00 |
|
fan
|
62a7cce5f1
|
返回仿真不退出全屏
|
2019-11-08 18:52:09 +08:00 |
|
fan
|
b8b73a2151
|
merge
|
2019-11-08 18:45:08 +08:00 |
|
fan
|
daec7d5e4d
|
bug 调整
|
2019-11-08 18:43:46 +08:00 |
|
zyy
|
a348552d1e
|
desc: 增加选中批量设置集中站操作
|
2019-11-08 18:32:39 +08:00 |
|
ival
|
4816ca97b8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/views/display/designIndex.vue
# src/views/display/index.vue
|
2019-11-08 18:20:56 +08:00 |
|
joylink_cuiweidong
|
ee600f8915
|
skinCode调整
|
2019-11-08 18:19:35 +08:00 |
|
ival
|
46effe5ca8
|
提交代码
|
2019-11-08 18:17:34 +08:00 |
|
ival
|
6049c04a74
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 18:16:43 +08:00 |
|
ival
|
0776d08053
|
修改仿真房间代码
|
2019-11-08 18:15:52 +08:00 |
|
fan
|
f75f992776
|
订阅topic 区分平台
|
2019-11-08 17:52:30 +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
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
zyy
|
4c48145465
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
|
2019-11-08 14:37:17 +08:00 |
|
zyy
|
7a359e5f6e
|
desc: 修改代码
|
2019-11-08 14:36:41 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
fan
|
06f6b920e9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 14:00:09 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
71171625fa
|
删除console
|
2019-11-08 13:44:49 +08:00 |
|
fan
|
7648bbb5f5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 13:41:41 +08:00 |
|
fan
|
b4ba9cb3b8
|
代码修改
|
2019-11-08 13:41:22 +08:00 |
|
joylink_cuiweidong
|
0e674de983
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 13:02:28 +08:00 |
|
joylink_cuiweidong
|
32f0006726
|
剧本录制调整
|
2019-11-08 13:01:41 +08:00 |
|
joylink_cuiweidong
|
84562c94dc
|
剧本代码调整
|
2019-11-08 10:59:56 +08:00 |
|
fan
|
7e13f98167
|
发布课程管理form 添加城市与地图的级联关系
|
2019-11-08 10:57:07 +08:00 |
|
fan
|
f8d6a3eb9f
|
课程发布管理添加归属地图
|
2019-11-08 10:21:54 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
joylink_cuiweidong
|
2f1cc475a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/en/map.js
# src/utils/baseUrl.js
|
2019-11-08 09:41:33 +08:00 |
|
ival
|
ddfa368268
|
修改代码
|
2019-11-08 09:13:38 +08:00 |
|
ival
|
a2a793d36d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/trainRoom/index.vue
|
2019-11-08 09:03:28 +08:00 |
|
ival
|
b99f994541
|
修改代码
|
2019-11-08 09:02:18 +08:00 |
|
joylink_cuiweidong
|
2bef8e867b
|
剧本添加列车驾驶模式指令
|
2019-11-07 19:39:52 +08:00 |
|
zyy
|
5a2ff68b15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 18:46:23 +08:00 |
|
zyy
|
16e13f38b5
|
desc: 调整格式
|
2019-11-07 18:46:17 +08:00 |
|
fan
|
a82474dc14
|
产品编码修改
|
2019-11-07 17:18:08 +08:00 |
|
joylink_cuiweidong
|
b4400f9226
|
代码调整
|
2019-11-07 16:26:55 +08:00 |
|
joylink_cuiweidong
|
6102c29116
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 15:55:02 +08:00 |
|
joylink_cuiweidong
|
5465eb61c1
|
prdCode改成prdId
|
2019-11-07 15:54:49 +08:00 |
|
zyy
|
42a5f7076a
|
desc: 调整区段绘图逻辑优化
|
2019-11-07 15:20:39 +08:00 |
|
zyy
|
4e1ee242a5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 10:42:32 +08:00 |
|
zyy
|
d2e99dbfd3
|
desc: 调整代码
|
2019-11-07 10:42:22 +08:00 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
zyy
|
796ef7087f
|
desc: 修改代码
|
2019-11-06 18:49:55 +08:00 |
|
ival
|
45455859b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:40:33 +08:00 |
|
ival
|
b39bb21854
|
修改代码
|
2019-11-06 18:40:23 +08:00 |
|
zyy
|
1a4dbf49d2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:39:04 +08:00 |
|
zyy
|
18fb36b1b9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/config/skinCode/fuzhou_01.js
# src/jmap/map.js
|
2019-11-06 18:38:50 +08:00 |
|
joylink_cuiweidong
|
521a50ccb6
|
代码调整
|
2019-11-06 18:38:28 +08:00 |
|
zyy
|
9f1f02bf0e
|
desc: 增加绘图撤销，重做
|
2019-11-06 18:37:32 +08:00 |
|
joylink_cuiweidong
|
9424dfb001
|
权限分发调整
|
2019-11-06 13:41:02 +08:00 |
|
fan
|
7753e82fa9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 10:49:42 +08:00 |
|
joylink_cuiweidong
|
568e335a59
|
代码调整
|
2019-11-06 10:42:53 +08:00 |
|
fan
|
7ff1878389
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 09:33:08 +08:00 |
|
fan
|
24f313045b
|
国际化修正
|
2019-11-06 08:57:35 +08:00 |
|
joylink_cuiweidong
|
5b4f9084d2
|
代码调整
|
2019-11-05 19:22:21 +08:00 |
|
joylink_cuiweidong
|
6a2a0b0b5e
|
代码调整
权限分发国际化调整
|
2019-11-05 19:03:20 +08:00 |
|
joylink_cuiweidong
|
94120489a4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-05 17:22:03 +08:00 |
|
joylink_cuiweidong
|
2228b1f089
|
权限转增接口调整
|
2019-11-05 17:21:05 +08:00 |
|
joylink_cuiweidong
|
8d4964a304
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/zh/router.js
|
2019-11-05 16:59:25 +08:00 |
|
joylink_cuiweidong
|
47da2feb36
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 16:53:58 +08:00 |
|
joylink_cuiweidong
|
f8298400f1
|
代码优化
权限分发转赠接口调整
|
2019-11-05 16:53:39 +08:00 |
|
fan
|
8f8caba6a3
|
系统通知样式调整
|
2019-11-05 16:45:09 +08:00 |
|
fan
|
1b3fc52f98
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-05 16:40:55 +08:00 |
|
fan
|
ce7ca4b9d8
|
添加系统通知功能
|
2019-11-05 16:40:36 +08:00 |
|
ival
|
5fc745b799
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 14:16:09 +08:00 |
|
ival
|
37fdeec4e3
|
修改代码
|
2019-11-05 14:15:55 +08:00 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
7921c9fde4
|
登录页样式调整
|
2019-11-05 13:15:59 +08:00 |
|
fan
|
d54ed0329b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 18:42:07 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
joylink_cuiweidong
|
cf69d44833
|
代码优化
系统管理用户实训统计接口调整
|
2019-11-04 14:05:55 +08:00 |
|
fan
|
347e49f55c
|
调整接口
|
2019-11-04 13:29:51 +08:00 |
|
fan
|
b87fa71979
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 11:29:46 +08:00 |
|
fan
|
d381ed6a88
|
西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化
|
2019-11-04 11:29:35 +08:00 |
|
joylink_cuiweidong
|
075cdf5fd9
|
页面样式调整
代码优化
|
2019-11-04 10:59:50 +08:00 |
|
zyy
|
1c373822ee
|
desc: 修改代码
|
2019-11-04 10:33:45 +08:00 |
|
zyy
|
645326bf6a
|
Merge branch 'dev' into test
|
2019-11-01 18:09:17 +08:00 |
|
zyy
|
92b06df4b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 18:08:12 +08:00 |
|
zyy
|
bc332c1a9d
|
desc: 调整国际化，高度问题
|
2019-11-01 18:08:05 +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
|
6d6e851449
|
Merge branch 'dev' into test
|
2019-11-01 13:51:26 +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
|
90c8349a8f
|
Merge branch 'dev' into test
|
2019-10-31 18:44:04 +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 |
|
fan
|
cf39a8fa89
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 17:49:20 +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 |
|
fan
|
a250d54cb4
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 16:04:57 +08:00 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +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 |
|
ival
|
9ceacf7cef
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-31 15:22:13 +08:00 |
|
ival
|
1179c9acd6
|
移植system
|
2019-10-31 15:20:16 +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
|
b5db06f833
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-31 14:40:14 +08:00 |
|
fan
|
547589331b
|
发布地图管理调整调整
|
2019-10-31 14:35:28 +08:00 |
|
fan
|
dceba96db0
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/drive/jl3ddrive.vue
|
2019-10-31 14:00:42 +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 |
|
sunzhenyu
|
3d9a458d42
|
修改三维数据接口,修改渲染范围
|
2019-10-31 13:26:40 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
sunzhenyu
|
72988575eb
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-31 13:07:04 +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 |
|
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 |
|
fan
|
6e6fe0bf59
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 19:05:20 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
zyy
|
2d8547182b
|
desc: 调整文件位置
|
2019-10-30 18:38:00 +08:00 |
|
zyy
|
75f9cf8a70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/chengdu_03/planSchedule/menuBar.vue
|
2019-10-30 18:25:50 +08:00 |
|
zyy
|
10565fdd6b
|
desc: 调整地图绘制高度问题
|
2019-10-30 18:25:13 +08:00 |
|
fan
|
0311e5ee4f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:18:32 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +08:00 |
|
joylink_cuiweidong
|
2df4c5f8cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 18:07:45 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
fan
|
5bca5be2e4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:03:42 +08:00 |
|
fan
|
fa1fc4c3cf
|
删除接口：/api/mapPrd/tree
|
2019-10-30 18:03:30 +08:00 |
|
fan
|
e5c832aa00
|
修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list
|
2019-10-30 17:41:29 +08:00 |
|
ival
|
a97c1945c0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 17:26:31 +08:00 |
|
ival
|
7d1d7758e4
|
增加时间北京颜色
|
2019-10-30 17:26:16 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +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 |
|
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
|
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
|
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 |
|
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
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
fan
|
9c99b2f451
|
queryform 调整
|
2019-10-28 10:26:33 +08:00 |
|
sunzhenyu
|
300aa624df
|
更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效
|
2019-10-25 18:42:56 +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 |
|
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
|
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
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +08:00 |
|
joylink_cuiweidong
|
c0394657a8
|
代码调整
|
2019-10-24 14:13:20 +08:00 |
|
fan
|
4a0c04d98a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 14:03:38 +08:00 |
|
fan
|
b6ffc55efd
|
登录页面整合
|
2019-10-24 14:03:19 +08:00 |
|
joylink_cuiweidong
|
6dc74ac5c8
|
代码优化
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
|
2019-10-24 11:20:00 +08:00 |
|
zyy
|
17626459f5
|
Merge branch 'dev' into test
|
2019-10-24 09:49:49 +08:00 |
|
zyy
|
dd89b94e64
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Logout.vue
|
2019-10-24 09:47:57 +08:00 |
|