ival
|
ee6237be6b
|
关闭新执行流程
|
2019-11-18 14:48:53 +08:00 |
|
ival
|
aee164fb4f
|
修改大小写
|
2019-11-18 14:47:19 +08:00 |
|
ival
|
a80b010bfa
|
修改大小写
|
2019-11-18 14:46:57 +08:00 |
|
ival
|
3cffd163ad
|
增加文件
|
2019-11-18 14:45:23 +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 |
|
sunzhenyu
|
e2405eba15
|
修改信号机判断逻辑
|
2019-11-15 18:40:45 +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
|
576e41b64d
|
注释
|
2019-11-15 17:47:07 +08:00 |
|
sunzhenyu
|
03c97eefef
|
修改三维订阅接口
|
2019-11-15 17:34:07 +08:00 |
|
sunzhenyu
|
f7b909f85d
|
修改连接
|
2019-11-15 17:24:13 +08:00 |
|
joylink_cuiweidong
|
a27d8f4c1d
|
代码调整
|
2019-11-15 17:15:41 +08:00 |
|
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 |
|