Commit Graph

3135 Commits

Author SHA1 Message Date
joylink_cuiweidong
e1d979e89a 代码调整 2020-01-02 17:06:35 +08:00
fan
c8a6e0d8ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 17:01:23 +08:00
fan
65b766e27f 项目设备管理 2020-01-02 17:01:11 +08:00
zyy
0b3e3311f0 删除控制模式 2020-01-02 14:57:13 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
zyy
e750406484 Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd 2020-01-02 10:46:17 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
fan
8466bcb059 成都三指令调整 2020-01-02 09:49:41 +08:00
fan
57e38a37a5 成都三指令调整 2020-01-02 09:29:23 +08:00
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
fan
396e901a4d 添加/ 2020-01-02 09:06:03 +08:00
zyy
8b2158294e 调整指令参数 2019-12-31 18:50:43 +08:00
sunzhenyu
33966b5a33 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-31 18:21:34 +08:00
sunzhenyu
432aff42a3 修改仿真驾驶换车错位 2019-12-31 18:20:53 +08:00
zyy
cf370249eb 调整指令 2019-12-31 18:10:49 +08:00
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