Commit Graph

787 Commits

Author SHA1 Message Date
joylink_cuiweidong
59940ece21 竞赛平台 实操删除 切换地图 按钮 2020-11-16 10:53:16 +08:00
sunzhenyu
ea4ce90b19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 18:31:55 +08:00
sunzhenyu
c02d37872c 修改北交大三维客流显示 2020-11-13 18:31:48 +08:00
joylink_cuiweidong
90a2e6d228 代码调整 2020-11-13 18:29:01 +08:00
joylink_cuiweidong
bdc9be6465 仿真运行图 表号排序 代码调整 2020-11-13 17:10:54 +08:00
zyy
b68424c3db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 14:20:47 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
joylink_cuiweidong
95bb8dff30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 14:14:34 +08:00
joylink_cuiweidong
0e7f27c1db 运行图 测试代码调整 2020-11-13 14:14:18 +08:00
fan
927d7b9f16 交大项目调整 2020-11-13 13:31:44 +08:00
sunzhenyu
9a286521a6 merge 2020-11-13 09:36:44 +08:00
zyy
009f7b57a2 调整国赛场景说明 2020-11-13 09:34:12 +08:00
zyy
9ed22a6075 Merge remote-tracking branch 'remotes/origin/test' 2020-11-12 19:43:20 +08:00
zyy
19e1a4208e 增加场景说明 2020-11-12 19:42:33 +08:00
joylink_cuiweidong
bc71bf5a1d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-12 19:05:37 +08:00
joylink_cuiweidong
e5e7111965 运行图绘制代码调整 2020-11-12 19:04:57 +08:00
zyy
eb9c9d8ee3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-11-12 15:42:18 +08:00
zyy
c875c1bac0 调整格式 2020-11-12 15:41:35 +08:00
sunzhenyu
6ef0a46870 urlmerge 2020-11-12 15:00:14 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
zyy
866bf2414b 调整实操菜单 2020-11-11 16:56:38 +08:00
zyy
286acf7348 调整剧本场景编辑 2020-11-11 16:09:43 +08:00
joylink_cuiweidong
5012f9ce58 代码调整 2020-11-11 09:13:41 +08:00
joylink_cuiweidong
d6c55ad016 修改角色 车辆段 为 车辆段信号楼 2020-11-10 16:20:03 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
zyy
35b3d115fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 18:25:08 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
joylink_cuiweidong
110ff2b1c2 仿真退出 重置状态 代码调整
删除无用的文件
2020-11-09 16:15:20 +08:00
joylink_cuiweidong
b439232fef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 15:17:31 +08:00
joylink_cuiweidong
8d14c93231 仿真代码调整 2020-11-09 15:17:11 +08:00
fan
0553c4ce5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 11:31:45 +08:00
fan
a6ebcda15e 北交大项目调整 2020-11-09 11:31:20 +08:00
sunzhenyu
3a76731646 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 18:28:39 +08:00
sunzhenyu
3ad0ccffc1 增加三维客流规划模块 2020-11-06 18:28:30 +08:00
joylink_cuiweidong
42fb506612 剧本预览代码调整 2020-11-06 17:44:36 +08:00
joylink_cuiweidong
0a4de52bb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 15:04:47 +08:00
joylink_cuiweidong
5eedbdf1e5 剧本录制代码调整 2020-11-06 15:04:18 +08:00
zyy
a7519ae06e 调整剧本描述,及样式 2020-11-06 14:50:13 +08:00
zyy
8f1e38ce29 调整剧本显示,菜单显示 2020-11-06 14:11:16 +08:00
zyy
f3162dfbd8 调整场景描述位置,调整列车清空逻辑 2020-11-06 13:41:33 +08:00
fan
a36acdbd45 按钮顺序调整 2020-11-06 13:20:15 +08:00
zyy
e897673742 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 10:51:12 +08:00
zyy
e792597fd8 调整场景显示 2020-11-06 10:50:58 +08:00
fan
08580da2a9 剧本提示控制模式=》系统/站遥控&条件管理清除stop 2020-11-06 09:48:51 +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
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
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
55dda9ca10 添加停车场信号楼角色 2020-11-04 09:26:22 +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
joylink_fanyuhong
1a6897b849 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/utils/baseUrl.js
2020-10-30 18:27:56 +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
12f08768da 代码调整 2020-10-30 15:36:39 +08:00
joylink_cuiweidong
7665c3a97d 剧本编制代码调整
仿真 剧本 会话 综合演练 添加 电力调度角色
2020-10-30 11:24:42 +08:00
joylink_cuiweidong
7c865e969b 场景编制代码调整 2020-10-29 18:48:59 +08:00
joylink_cuiweidong
286f0b314e 场景编制代码调整 2020-10-29 18:12:42 +08:00
joylink_cuiweidong
54b6095b5a 代码调整 2020-10-29 09:41:56 +08:00
joylink_cuiweidong
f70294f5b2 代码调整 2020-10-28 16:40:33 +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
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +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
joylink_cuiweidong
509d43c834 竞赛 运营统计数据弹窗 初始化问题调整 2020-10-28 09:45:04 +08:00
zyy
7882c1ed7f 删除多余接口 2020-10-27 18:42:18 +08:00
joylink_cuiweidong
9b988f318f 草稿剧本 导入导出功能添加
竞赛场景导出功能添加
2020-10-27 17:57:59 +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
1a6835c3cf merge 2020-10-26 11:09:48 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +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
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +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
joylink_cuiweidong
f91dd07cab 竞赛 场景代码调整 2020-10-14 18:10:32 +08:00
joylink_cuiweidong
17a18eb328 竞赛 实操 场景调整 2020-10-14 17:10:25 +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
cafa638438 竞赛代码调整 2020-10-13 18:41:55 +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
95eb654911 场景代码调整 2020-10-13 16:39:11 +08:00
joylink_cuiweidong
39b06463b8 代码调整 2020-10-13 14:41:42 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
fan
1b1b3fc221 故障调整 2020-10-12 20:13:42 +08:00
fan
443e3d7748 故障调整 2020-10-12 20:09:00 +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
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
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
bca528df88 竞赛 理论考试代码调整 / 竞赛 场景更新代码调整 2020-09-28 14:02:04 +08:00
joylink_cuiweidong
dd9ffdeb52 删除不必要的文件 2020-09-25 14:48:09 +08:00
joylink_cuiweidong
2386f424d4 竞赛 理论考试 代码调整 2020-09-25 14:46:57 +08:00
joylink_cuiweidong
fcf01baa53 竞赛 理论考试 练习模式代码调整 2020-09-24 13:42:01 +08:00
joylink_cuiweidong
d67aa6804f 竞赛 理论考试 代码调整 2020-09-23 18:44:00 +08:00
joylink_cuiweidong
e094134960 剧本代码调整 2020-09-21 16:24:17 +08:00
joylink_cuiweidong
047c9aa127 剧本 代码调整 2020-09-21 14:20:33 +08:00
joylink_cuiweidong
91e34add37 剧本代码调整 2020-09-21 13:38:37 +08:00
joylink_cuiweidong
f6f1d45fe5 竞赛 剧本代码调整 2020-09-18 18:18:02 +08:00
joylink_cuiweidong
41548dd32f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/dispatherContest/index.vue
2020-09-18 16:05:07 +08:00
joylink_cuiweidong
6cad4eabdb 竞赛系统 剧本加载逻辑调整 2020-09-18 16:02:22 +08:00
fan
aa52945003 行调大赛 2020-09-17 18:30:31 +08:00
fan
f7e350ca95 行调大赛理论考试&福州Iscs 2020-09-17 18:25:37 +08:00
fan
28e9bf2dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 15:37:01 +08:00
fan
588f77173a 行调大赛理论考试&福州Iscs 2020-09-17 15:36:46 +08:00
joylink_cuiweidong
5428f98843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/jlmap3d/passflow/jl3dpassflow.vue
2020-09-17 15:23:14 +08:00
joylink_cuiweidong
e93755a29f 哈尔滨 真实摄像头添加(暂时不能播放) 2020-09-17 15:19:00 +08:00
fan
f586cced67 行调大赛理论考试 2020-09-17 09:50:52 +08:00
zyy
24266de0f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 14:26:17 +08:00
zyy
64c322751c 调整ibp盘流程 2020-09-16 14:26:04 +08:00
fan
e5d83555af 添加大赛练习 2020-09-16 10:49:16 +08:00
fan
6401255a36 会话调整 2020-09-11 17:10:11 +08:00
fan
3ca753a31b 调整会话和drts倒计时时间 2020-09-11 13:23:24 +08:00
fan
60bfa0504b 剧本加载重新获取运行数据&会话调整&drts添加连接 2020-09-11 10:08:25 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
zyy
c3c5850bbf 调整仿真时间同步 2020-09-07 17:07:09 +08:00
fan
878b62e494 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:03:03 +08:00
fan
c521f39b2a 设备登录增加退出方式 2020-09-07 16:02:53 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
fan
b47b63305a 运行图预览调整 2020-09-04 18:04:32 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
joylink_cuiweidong
4789fa23de 代码调整 2020-09-02 09:48:30 +08:00
joylink_cuiweidong
935588ab32 剧本预览代码调整 2020-09-02 09:46:17 +08:00
joylink_cuiweidong
b42ffaa00f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:27:56 +08:00
joylink_cuiweidong
de8263e062 剧本编制代码优化调整 2020-09-01 18:27:36 +08:00
fan
15039440b7 运行图预览初始化动态数据和选中数据 2020-09-01 17:20:59 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
fan
13764f98a7 修改会话问题
(cherry picked from commit 716e7c2117)
2020-09-01 11:22:01 +08:00
fan
46e6ec68d5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 18:32:56 +08:00
fan
1164be59a4 修改剧本id 2020-08-31 18:32:33 +08:00
joylink_cuiweidong
9ef2ac1287 剧本代码调整 2020-08-31 16:37:45 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00