Commit Graph

3318 Commits

Author SHA1 Message Date
zyy
760225549e 兼容新旧两种发送机制 2019-12-31 17:20:04 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
zyy
e03a4d12e0 调整宁波一号线 2019-12-31 16:24:22 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
e6421dbeb6 Merge remote-tracking branch 'origin/dev' into test 2019-12-31 15:57:09 +08:00
fan
ef1f301292 菜单置灰调整 2019-12-31 15:53:55 +08:00
fan
7dde1958f5 皮肤实例化调整 2019-12-31 15:36:49 +08:00
sunzhenyu
e2e9bc7be3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-31 15:13:36 +08:00
sunzhenyu
465520368b 修改新数据读取逻辑 2019-12-31 15:13:29 +08:00
joylink_cuiweidong
48e6318a24 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-31 15:04:28 +08:00
joylink_cuiweidong
9f2ad62c8f 浏览器地址栏输入根目录 跳转到实训平台登陆页面
实训平台权限代码调整
2019-12-31 15:02:58 +08:00
joylink_cuiweidong
ac51cf72ae Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-31 14:38:10 +08:00
fan
0504a2a2a6 迁移cmd分支 2019-12-31 14:32:04 +08:00
fan
4ce64c614b 问题调整 2019-12-31 14:30:23 +08:00
fan
eb8f64af27 课程系统左侧栏 2019-12-31 13:15:28 +08:00
joylink_cuiweidong
8f5a029467 权限分发<创建权限> 购买时长和购买总价加减代码调整 2019-12-31 10:22:58 +08:00
fan
efdd241d2c 初始路由跳转调整 2019-12-31 09:12:40 +08:00
joylink_cuiweidong
0caa944d0d Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-30 19:04:36 +08:00
fan
f8c7a46743 调整合并问题 2019-12-30 18:58:23 +08:00
joylink_cuiweidong
4ce7b8250a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-30 18:47:09 +08:00
joylink_cuiweidong
ca6ca0ecc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:45:17 +08:00
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev
# Conflicts:
#	src/views/demonstration/detail/index.vue
2019-12-30 18:45:05 +08:00
fan
e4aa7a2ccf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_gzb 2019-12-30 18:25:22 +08:00
fan
bd8e3c0fc3 添加枚举 2019-12-30 18:25:01 +08:00
joylink_cuiweidong
dc9a059a7b 实训平台仿真权限代码调整 2019-12-30 18:14:52 +08:00
zyy
dbca771102 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:13:44 +08:00
zyy
b336e1844b 调整宁波一号线右键菜单操作及显示流程 2019-12-30 18:13:38 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
cbac3d2b9d 权限分发管理,创建权限 打包 接口调整 2019-12-30 17:13:21 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
joylink_cuiweidong
23d14d6c8e 实训平台 教学详情和仿真详情 合计改为权限总数 2019-12-30 09:58:43 +08:00
fan
15f7aa656e 新版地图包加载仿真 2019-12-30 09:57:54 +08:00
joylink_cuiweidong
0c9843f233 代码调整 2019-12-30 09:36:35 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
40bc4840e7 prdType 接口调整 2019-12-27 19:36:29 +08:00
joylink_cuiweidong
0486d0211b prdType对应接口修改 2019-12-27 18:48:56 +08:00
sunzhenyu
248075d338 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-27 18:10:22 +08:00
sunzhenyu
c387c3836f 修改数字沙盘行车逻辑bug,逻辑改为目的地link判断是否行使,修正初始列车坐标赋值 2019-12-27 18:10:14 +08:00
fan
e5997a5856 修复: 信号机接近区段检索后台无数据是清空之前的数据 2019-12-27 17:32:22 +08:00
joylink_cuiweidong
eefaf8aad9 实训平台教学 和 设计平台教学管理 prdtype对应接口调整 2019-12-27 17:09:56 +08:00
fan
a285d28cb3 整理代码 2019-12-27 15:23:42 +08:00
joylink_cuiweidong
59f4a8d253 仿真里面的prdtype调整 2019-12-27 14:20:29 +08:00
joylink_cuiweidong
493aab5409 删除与产品相关的接口
修改仿真的prdtype接口代码
2019-12-27 14:04:34 +08:00
joylink_cuiweidong
25ff5bdb6b 删除仿真里的回放 2019-12-27 11:30:49 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
f985a93c9e 设计平台 课程设计 实训管理 prdtype 接口调整 2019-12-27 10:47:07 +08:00
joylink_cuiweidong
e67d1fb279 删除maprd有关的接口 2019-12-27 10:24:14 +08:00
joylink_cuiweidong
d15eca77ea 删除系统管理产品编辑
删除发布内容管理产品状态
2019-12-27 10:04:09 +08:00