Commit Graph

1837 Commits

Author SHA1 Message Date
joylink_cuiweidong
8ad829cf24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:06:50 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
2020-11-03 16:06:11 +08:00
fan
4e0b6dc7e6 取消实训考试重置默认状态 2020-11-03 14:06:30 +08:00
fan
dcd0607973 北交大项目登录 2020-11-03 13:39:14 +08:00
fan
ccabd4a729 实训问题调整 2020-11-02 19:08:04 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
joylink_cuiweidong
9f95af633a 代码调整 2020-11-02 10:01:24 +08:00
zyy
be8a5f7768 推出场景清空信息 2020-10-30 18:16:40 +08:00
joylink_cuiweidong
f749e4fc2a 竞赛代码调整 2020-10-30 16:04:32 +08:00
joylink_cuiweidong
0bac44bba7 竞赛代码调整 2020-10-30 15:52:23 +08:00
joylink_cuiweidong
7dbe32237d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:36:53 +08:00
joylink_cuiweidong
12f08768da 代码调整 2020-10-30 15:36:39 +08:00
zyy
dfbca08c80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:26:54 +08:00
zyy
04ec59780b 增加语音聊天当前播放提示 2020-10-30 15:26:31 +08:00
joylink_cuiweidong
c8493d3833 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 11:25:02 +08:00
joylink_cuiweidong
7665c3a97d 剧本编制代码调整
仿真 剧本 会话 综合演练 添加 电力调度角色
2020-10-30 11:24:42 +08:00
zyy
62d8e4d4d6 删除延续保护生成code 2020-10-30 10:59:11 +08:00
zyy
80574fe22e 调整地图延续保护 2020-10-30 10:37:53 +08:00
fan
3341f5475c 问题调整 2020-10-30 10:23:11 +08:00
joylink_cuiweidong
0cee63e90e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 18:49:29 +08:00
joylink_cuiweidong
7c865e969b 场景编制代码调整 2020-10-29 18:48:59 +08:00
zyy
860b00e9b3 调整地图绘制流程 2020-10-29 18:33:35 +08:00
joylink_cuiweidong
286f0b314e 场景编制代码调整 2020-10-29 18:12:42 +08:00
fan
237b8ef4d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 10:02:31 +08:00
fan
4709074825 调整供电线 2020-10-29 10:02:21 +08:00
joylink_cuiweidong
859ffdaaff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 09:42:14 +08:00
joylink_cuiweidong
54b6095b5a 代码调整 2020-10-29 09:41:56 +08:00
fan
36d6a7d81c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:19:46 +08:00
fan
583af97620 供电线添加元素 2020-10-28 18:18:34 +08:00
joylink_cuiweidong
897e434201 代码调整 2020-10-28 17:54:06 +08:00
zyy
0084c4687e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 16:15:08 +08:00
zyy
6124f6c38a 删除多余配置 2020-10-28 16:14:57 +08:00
joylink_cuiweidong
cdb56ef33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
2020-10-28 15:56:23 +08:00
zyy
12e84a6a49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/project.js
2020-10-28 13:52:36 +08:00
zyy
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +08:00
joylink_cuiweidong
3003a5eb2a 代码调整 2020-10-28 13:05:13 +08:00
fan
eb35221c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:11:48 +08:00
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
joylink_cuiweidong
433e839e75 Merge remote-tracking branch 'remotes/origin/master' into test 2020-10-28 10:36:18 +08:00
joylink_cuiweidong
6451eb7815 代码调整 2020-10-28 10:33:23 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
fan
9dc3a4528d merge 2020-10-28 10:00:48 +08:00
fan
2509d11baf 代码调整 2020-10-28 10:00:04 +08:00
joylink_cuiweidong
509d43c834 竞赛 运营统计数据弹窗 初始化问题调整 2020-10-28 09:45:04 +08:00
zyy
7882c1ed7f 删除多余接口 2020-10-27 18:42:18 +08:00
zyy
285f2e2807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 18:04:35 +08:00
zyy
aebf120bd8 调整状态删除无用接口 2020-10-27 18:04:19 +08:00
joylink_cuiweidong
d9415d81be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 17:59:32 +08:00