sunzhenyu
|
2a3efbd7cf
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-15 16:56:39 +08:00 |
|
ival
|
d25cfd6101
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-15 16:51:09 +08:00 |
|
ival
|
a8e0ff947f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:50:23 +08:00 |
|
ival
|
1dbc428e19
|
修改代码
|
2019-11-15 16:50:09 +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
|
cb8e55e546
|
修改代码
|
2019-11-15 16:36:23 +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 |
|
ival
|
b3f9777062
|
修改代码
|
2019-11-15 16:32:23 +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
|
1818ddaeb1
|
代码调整
|
2019-11-15 13:19:17 +08:00 |
|
joylink_cuiweidong
|
859fbe5e4e
|
修改实训平台考试系统列表按钮显示
|
2019-11-15 11:40:49 +08:00 |
|
fan
|
d2b296153a
|
权限分发管理增加搜索条件，试题列表改为试卷列表
|
2019-11-15 10:53:13 +08:00 |
|
fan
|
6e8b69869b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 09:43:12 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
zyy
|
1b564c2958
|
删除注释
|
2019-11-15 09:18:22 +08:00 |
|
fan
|
382a4fa344
|
调整narbar
|
2019-11-15 09:09:09 +08:00 |
|
fan
|
898e18056f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 18:55:07 +08:00 |
|
fan
|
a52c1443f3
|
调整narbar
|
2019-11-14 18:54:58 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +08:00 |
|
zyy
|
d782d7e151
|
修改路由状态
|
2019-11-14 17:58:21 +08:00 |
|
zyy
|
8ff33b479a
|
调整路由
|
2019-11-14 17:10:04 +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
|
f9129558a6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:45:46 +08:00 |
|
ival
|
c362d64048
|
修改代码
|
2019-11-14 16:45:31 +08:00 |
|
zyy
|
94e77b6c6d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:31:44 +08:00 |
|
zyy
|
805fe3d971
|
修改路由配置
|
2019-11-14 16:31:31 +08:00 |
|
fan
|
f07144689b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 16:23:28 +08:00 |
|
fan
|
d7df05f475
|
代码调整
|
2019-11-14 16:22:39 +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
|
e6b81355a4
|
删除多余文件
|
2019-11-14 15:51:42 +08:00 |
|
ival
|
3d493cd361
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 15:10:45 +08:00 |
|
ival
|
e41d007264
|
注释掉变动，提交
|
2019-11-14 15:10:29 +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
|
0bcf2b796e
|
修改
|
2019-11-14 14:05:05 +08:00 |
|