Commit Graph

2025 Commits

Author SHA1 Message Date
zyy
e792597fd8 调整场景显示 2020-11-06 10:50:58 +08:00
fan
143c2a27ee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 09:49:13 +08:00
fan
08580da2a9 剧本提示控制模式=》系统/站遥控&条件管理清除stop 2020-11-06 09:48:51 +08:00
lVAL
cc4edd174c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 09:26:55 +08:00
lVAL
5aefda5ef0 修改设计平台,table样式,增加padding:50px 2020-11-06 09:26:41 +08:00
fan
f09b1aa17d 按计划行车状态判断调整 2020-11-05 17:32:48 +08:00
lVAL
cfc6f9648a 修改重置背景,按计划行车状态错误的问题 2020-11-05 16:58:42 +08:00
joylink_cuiweidong
241633ef53 竞赛 选择角色 默认选id最小的行调 2020-11-05 15:50:35 +08:00
fan
d5371da85c 会话文字接口调整 2020-11-05 14:40:08 +08:00
fan
25f1f7934d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-05 13:54:29 +08:00
fan
af42284fef 会话问题调整 2020-11-05 13:54:20 +08:00
joylink_cuiweidong
c4b88ec9e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-05 13:33:53 +08:00
joylink_cuiweidong
3639cc32e6 剧本动作 转换函数代码调整 2020-11-05 13:33:38 +08:00
fan
38f3f82e18 剧本录制会话文字发送 2020-11-05 13:17:40 +08:00
joylink_cuiweidong
af316d4906 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 18:35:50 +08:00
joylink_cuiweidong
fc46f0b55e 运行图 车次号方向代码调整 2020-11-04 18:35:27 +08:00
fan
56888289d6 调整供电线type判断 2020-11-04 18:10:48 +08:00
fan
6f440e6215 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 18:09:16 +08:00
fan
9a9355fcac 调整仿真开始判断 2020-11-04 18:09:04 +08:00
joylink_cuiweidong
04c51b0aca 剧本提示代码调整 2020-11-04 17:15:53 +08:00
fan
d693cd0517 merge 2020-11-04 16:43:58 +08:00
fan
2c79a2bce0 merge 2020-11-04 16:42:29 +08:00
fan
08a306f373 剧本条件调整 2020-11-04 16:41:01 +08:00
lVAL
847d97eb5d 优化替换背景 mask样式问题 2020-11-04 16:39:17 +08:00
joylink_cuiweidong
d7c8619243 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 16:14:58 +08:00
joylink_cuiweidong
8ff03944ce 哈尔滨教学实训代码调整 2020-11-04 16:14:41 +08:00
fan
06c252cd58 merge 2020-11-04 14:51:54 +08:00
fan
6993ad8d8e 剧本条件 2020-11-04 14:48:36 +08:00
lVAL
872a71c7b5 增加 替换背景的操作 2020-11-04 14:42:48 +08:00
sunzhenyu
2c1b9fcc45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 10:34:43 +08:00
sunzhenyu
23b98c7c46 增加客流规划界面 2020-11-04 10:34:33 +08:00
fan
09e5cac7b0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 09:26:39 +08:00
fan
55dda9ca10 添加停车场信号楼角色 2020-11-04 09:26:22 +08:00
joylink_cuiweidong
b312371a64 绘图---车站---按图折返字段删除
绘图---区段---公里标字段删除
2020-11-04 09:19:13 +08:00
joylink_cuiweidong
e8ee2efc50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 19:02:18 +08:00
joylink_cuiweidong
9aeb3d295c 剧本代码调整 2020-11-03 19:02:02 +08:00
fan
a1be6dbfb9 暂提 2020-11-03 18:52:33 +08:00
fan
0603e45a07 设置头码车调整参数 2020-11-03 18:23:30 +08:00
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
joylink_cuiweidong
9b988f318f 草稿剧本 导入导出功能添加
竞赛场景导出功能添加
2020-10-27 17:57:59 +08:00
zyy
e9e0d39bfc 调整状态多余代码 2020-10-27 16:51:57 +08:00
joylink_cuiweidong
3ac4945d71 代码调整 2020-10-26 18:41:10 +08:00
joylink_cuiweidong
36b8dbbdb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 17:50:53 +08:00
joylink_cuiweidong
4c185346cd 代码调整 2020-10-26 17:50:35 +08:00
zyy
a55c67c721 调整国赛菜单 2020-10-26 17:05:04 +08:00
joylink_cuiweidong
b0eefffae0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 15:54:27 +08:00
joylink_cuiweidong
14b78b57d6 竞赛会话代码调整 2020-10-26 15:54:08 +08:00
zyy
cdf91f98d2 调整综合监控流程 2020-10-26 15:24:08 +08:00
fan
e5b79263bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:10:08 +08:00
fan
1a6835c3cf merge 2020-10-26 11:09:48 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
zyy
9cbb5246d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:06:13 +08:00
zyy
98c4d1e2b8 调整国赛列车显示 2020-10-26 11:05:36 +08:00
joylink_cuiweidong
c14814890f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:41:56 +08:00
joylink_cuiweidong
4fa37b7c60 竞赛场景列表代码调整 2020-10-23 18:40:24 +08:00
fan
4f0f85c60c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:06:05 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
joylink_cuiweidong
dbf50b4324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:49:24 +08:00
joylink_cuiweidong
35df9b43ec 剧本编制代码调整
会话代码调整
2020-10-23 17:48:40 +08:00
zyy
1163d9def9 调整新建地图流程 2020-10-22 18:33:28 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
fan
4265ed0092 设备管理配置调整 2020-10-20 17:16:41 +08:00
fan
06a06a26d9 merge 2020-10-20 16:49:35 +08:00
fan
ceef20681f 理论题调整&设备管理调整&聊天室问题调整 2020-10-20 16:48:28 +08:00
joylink_cuiweidong
0af48e7887 竞赛 实操 自动播放代码调整 2020-10-20 11:06:41 +08:00
fan
528fda2c15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test11 2020-10-16 19:08:01 +08:00
fan
faa66eac29 修改剧本提示位置 2020-10-16 19:07:44 +08:00
joylink_cuiweidong
cbb43ad06a 竞赛实操结果页面代码调整 2020-10-16 17:38:03 +08:00
joylink_cuiweidong
ed46bb20a6 竞赛实操结果页面代码调整 2020-10-16 17:28:06 +08:00
joylink_cuiweidong
f4790fedd5 竞赛实操结果页面代码调整 2020-10-16 14:10:20 +08:00
joylink_cuiweidong
f25c52b36d 竞赛实操结果页面代码调整 2020-10-16 10:57:33 +08:00
joylink_cuiweidong
dad592e155 竞赛实操结果页面代码调整 2020-10-16 10:51:45 +08:00
joylink_cuiweidong
68dd6923e3 竞赛场景结束页面代码调整 2020-10-16 09:51:22 +08:00
joylink_cuiweidong
b55f8d00b5 竞赛代码调整 2020-10-15 19:01:09 +08:00
joylink_cuiweidong
09eb9e2a00 竞赛 实操结果弹窗代码调整 2020-10-15 18:21:02 +08:00
joylink_cuiweidong
653c01cec2 竞赛结果弹窗代码调整 2020-10-15 17:47:13 +08:00
fan
41f70aadd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 14:18:11 +08:00
fan
a0ac1a58e7 方向杆调整数据 2020-10-15 14:17:55 +08:00
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00
joylink_cuiweidong
5f921b7430 代码调整 2020-10-14 13:35:40 +08:00
joylink_cuiweidong
ce505f915b 竞赛平台代码调整 2020-10-14 09:47:19 +08:00
joylink_cuiweidong
a5025eda1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:42:18 +08:00
joylink_cuiweidong
cafa638438 竞赛代码调整 2020-10-13 18:41:55 +08:00
fan
8370b0cbd2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:13:21 +08:00
fan
42f706d39d 会话调整 2020-10-13 18:13:10 +08:00
joylink_cuiweidong
d9802336c5 竞赛平台实操代码调整 2020-10-13 17:32:39 +08:00
joylink_cuiweidong
2c3c46c5bc 场景编辑代码调整 2020-10-13 17:11:46 +08:00
joylink_cuiweidong
f3f1bd8b5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:40:27 +08:00
joylink_cuiweidong
95eb654911 场景代码调整 2020-10-13 16:39:11 +08:00
fan
d1aa2b8f39 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:34:44 +08:00
fan
9e437e43ad 方向杆调整 2020-10-13 16:34:33 +08:00
joylink_cuiweidong
6038352d88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:42:13 +08:00
joylink_cuiweidong
39b06463b8 代码调整 2020-10-13 14:41:42 +08:00
fan
6e479fdb3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:10:17 +08:00
fan
a0da15d731 方向杆调整 2020-10-13 14:10:08 +08:00
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
joylink_cuiweidong
ac47e8c346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 13:06:34 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
fan
29d642e09d 方向杆问题调整 2020-10-13 10:01:39 +08:00
fan
1b1b3fc221 故障调整 2020-10-12 20:13:42 +08:00
fan
443e3d7748 故障调整 2020-10-12 20:09:00 +08:00
fan
48b36d54f5 会话添加上级本门成员角色 2020-10-12 19:08:05 +08:00
fan
31e963474a baseUrl 2020-10-12 18:08:25 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
a790971fb3 故障触发问题调整 2020-10-12 16:47:43 +08:00
fan
537e03a5e7 故障触发问题调整 2020-10-12 16:33:59 +08:00
fan
17cd2bfcd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:21:42 +08:00
fan
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
2fd024e73a 故障触发问题调整&方向杆 2020-10-12 16:01:12 +08:00
joylink_cuiweidong
936d01fdd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:00:12 +08:00
joylink_cuiweidong
cee2b90048 竞赛 场景代码调整 2020-10-12 15:59:28 +08:00
fan
9e3b62b32f 故障触发问题调整 2020-10-12 15:50:11 +08:00
fan
875c8a021f 故障触发问题调整 2020-10-12 15:29:29 +08:00
fan
709ef4ddd0 故障触发问题调整 2020-10-12 15:25:55 +08:00
fan
da0276e0b8 故障触发问题调整 2020-10-12 15:22:39 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
fan
7b1864ce77 merge 2020-10-12 14:27:34 +08:00
joylink_cuiweidong
b64b6936f1 竞赛 实操场景代码调整 2020-10-12 14:26:57 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
joylink_cuiweidong
a081499bff 竞赛 实操代码调整 2020-10-12 13:47:58 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
fan
37a47e4c9c 绘图问题调整 2020-10-10 13:12:24 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
joylink_cuiweidong
fbb7784a5b 竞赛系统代码调整 竞赛场景编辑代码调整 2020-10-09 17:03:11 +08:00
joylink_cuiweidong
68921f80ff 竞赛系统 场景加载 已经开始演出接口代码调整 2020-10-09 14:37:59 +08:00
joylink_cuiweidong
63e2957216 调度电话 仿真初始化代码调整 2020-09-30 15:59:19 +08:00
joylink_cuiweidong
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
773e61519d 调度电话代码调整 2020-09-29 17:46:42 +08:00
joylink_cuiweidong
e7cb90c1cb 调度电话代码调整 2020-09-29 15:57:50 +08:00
joylink_cuiweidong
a6458e1519 会话 全选车站代码调整 2020-09-29 13:30:12 +08:00
joylink_cuiweidong
9141a6f92c 会话代码调整 3d挂载js路径修改 帮助文档路径修改 2020-09-29 13:18:31 +08:00
joylink_cuiweidong
bca528df88 竞赛 理论考试代码调整 / 竞赛 场景更新代码调整 2020-09-28 14:02:04 +08:00
zyy
13f4cccaae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:42:26 +08:00
zyy
f8d3b70021 调整会话流程 2020-09-25 18:41:59 +08:00
fan
a5c36b4fca 成员管理问题调整 2020-09-25 18:19:49 +08:00
joylink_cuiweidong
2c27c5a62c 会话代码调整 2020-09-25 17:33:18 +08:00
joylink_cuiweidong
7460428838 会话代码调整 2020-09-25 17:15:25 +08:00
zyy
bcdf1524cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:06 +08:00
zyy
55910a826b 调整会话 2020-09-25 15:22:54 +08:00
joylink_cuiweidong
dd9ffdeb52 删除不必要的文件 2020-09-25 14:48:09 +08:00
joylink_cuiweidong
4dfb904133 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 14:47:13 +08:00
joylink_cuiweidong
2386f424d4 竞赛 理论考试 代码调整 2020-09-25 14:46:57 +08:00
zyy
a0adc641b2 增加iconfont图标导入,调整逻辑 2020-09-25 13:58:41 +08:00
zyy
7fb7c0a819 调整代码 2020-09-24 19:04:33 +08:00
zyy
88ec572564 调整车站值班员按钮 2020-09-24 18:34:25 +08:00
zyy
8a28526fe1 调整样式 2020-09-24 17:55:06 +08:00
zyy
a5b954c017 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 17:26:12 +08:00