Commit Graph

1967 Commits

Author SHA1 Message Date
lVAL
5f48a7743e 增加AUS线路编辑功能,以及调整增加运行图组后的接口 2020-10-28 15:01:14 +08:00
fan
d6aa7b0c1d 哈尔滨加载备用车 2020-10-28 13:46:20 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
c660931d92 注释 2020-10-28 11:27:17 +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
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
e59ff1f39e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 09:35:19 +08:00
joylink_cuiweidong
3d18dbe9ca 删除暂时没用到的文件
解决设置计划车 弹出的对话框 没有初始化的问题
2020-10-28 09:35:02 +08:00
fan
1f955a2190 注释 2020-10-27 18:47:58 +08:00
fan
76bbc56825 哈尔滨报警 2020-10-27 18:43:04 +08:00
fan
23a92119bc merge 2020-10-27 17:01:19 +08:00
fan
85216079e4 理论调整 2020-10-27 17:00:00 +08:00
zyy
03845f3ed8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-10-27 16:52:51 +08:00
zyy
e9e0d39bfc 调整状态多余代码 2020-10-27 16:51:57 +08:00
joylink_cuiweidong
405915c56f 接口文件整理 2020-10-27 16:23:37 +08:00
joylink_cuiweidong
17e08686c6 站台绘图代码调整 2020-10-27 15:11:06 +08:00
fan
72789efe3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-27 13:19:40 +08:00
fan
e0ab1506da 处理数据调整 2020-10-27 13:19:31 +08:00
zyy
fdcbc79e34 成都一号线避免加载错误 2020-10-27 11:22:11 +08:00
fan
4ef0aa5093 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 15:17:41 +08:00
fan
d72e8baab6 竞赛皮肤调整 2020-10-26 15:16:48 +08:00
joylink_cuiweidong
da1b5f27d1 代码调整 2020-10-26 13:59:17 +08:00
joylink_cuiweidong
f34092741b 竞赛 添加 道岔钩锁指令(非语音指令)
删除不必要文件
2020-10-26 13:51:53 +08:00
fan
034650ad0f merge 2020-10-26 11:29:33 +08:00
fan
bc669b98f8 延续保护调整 2020-10-26 11:28:37 +08:00
lVAL
fa8126ec34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:17:53 +08:00
joylink_cuiweidong
4842dca6f4 代码调整 2020-10-26 11:13:37 +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
joylink_cuiweidong
f02775868c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:08:52 +08:00
joylink_cuiweidong
b1c2d74d29 代码调整 2020-10-26 11:08:16 +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
lVAL
773522b8f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 10:54:00 +08:00
lVAL
6111f07118 优化代码 2020-10-26 10:53:48 +08:00
joylink_cuiweidong
7cccb83a08 竞赛道岔区段添加取消临时限速操作 2020-10-26 10:39:44 +08:00
joylink_cuiweidong
f456e71a95 竞赛操作方式 由北京线路转换为宁波线路 2020-10-26 10:21:11 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
fan
c5a4dd68f3 添加设置计划车、设置头码车、设置人工车 2020-10-23 17:23:09 +08:00
fan
d529837e03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:35:38 +08:00
fan
6210911b2a 皮肤显示调整 2020-10-23 16:35:27 +08:00
lVAL
a32030695a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:15:51 +08:00
lVAL
5bc8be961d 优化代码 2020-10-23 16:15:39 +08:00
fan
a952ebeafe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:13:32 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
fan
1fce4cb363 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:47:29 +08:00
fan
dc7cf80222 国赛皮肤调整 2020-10-22 16:47:18 +08:00
joylink_cuiweidong
3d3fc84041 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:39:55 +08:00
joylink_cuiweidong
751ebe5a16 竞赛线路 列车样式调整 2020-10-22 16:39:34 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加,AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
fan
90390462a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:26:15 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
joylink_cuiweidong
7352193df1 代码调整 2020-10-22 14:29:55 +08:00
fan
6ce8978b8b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 14:25:26 +08:00
joylink_cuiweidong
c89c2f2e11 代码调整 2020-10-22 14:22:21 +08:00
fan
c2f350a0c2 国赛皮肤调整 2020-10-22 14:07:18 +08:00
fan
80c3f726b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 13:41:06 +08:00
fan
7613a38be1 国赛皮肤调整 2020-10-22 13:40:56 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
fan
12bcbdb02b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 17:50:32 +08:00
fan
8843ad6394 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 17:49:55 +08:00
fan
acd75346b9 道岔定位失表反位失表调整 2020-10-20 17:49:46 +08:00
lVAL
50426cbb7a 修改AUSTool的功能 2020-10-20 17:47:47 +08:00
lVAL
c37bec7fa4 修改AUSTool 拖动车次的问题 2020-10-20 17:33:43 +08:00
lVAL
a1604ed5a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-20 17:22:27 +08:00
lVAL
2fadaade87 增加车次号标签 2020-10-20 17:22:15 +08:00
fan
4265ed0092 设备管理配置调整 2020-10-20 17:16:41 +08:00
lVAL
d3ea1cd22e 增加AUSTool绘制区域功能 2020-10-20 15:38:26 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
lVAL
dc7a5ab749 增加运行图编辑的功能 2020-10-19 18:39:19 +08:00
lVAL
58c7914e8b 修改激活不灵活的问题 2020-10-16 13:57:33 +08:00
lVAL
541a1cabe4 增加绘图新建功能 2020-10-16 13:07:31 +08:00
fan
330ae450f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:25:19 +08:00
fan
ed6651cc4c 触发故障菜单 2020-10-16 11:25:07 +08:00
lVAL
bbe9ca1e28 修改运行图操作 2020-10-16 10:50:07 +08:00
ival
891ff8362a AUS运行编辑功能完善 2020-10-15 22:57:06 +08:00
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +08:00
lVAL
fe93ecebe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:06:06 +08:00
lVAL
80fb7641ae 增加AUS运行图工具的代码 2020-10-15 16:05:30 +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
lVAL
d68824b79a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 18:50:17 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
joylink_cuiweidong
96dfec83eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-14 16:20:08 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00
fan
17beb7b37f 方向杆调整 2020-10-14 14:27:52 +08:00
fan
61fe081713 方向杆调整 2020-10-14 13:29:31 +08:00
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
fan
05740d7d57 方向杆问题调整 2020-10-13 09:36:48 +08:00
fan
fd00154f0c 宁波一取消临时限速 2020-10-12 18:53:04 +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
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
9e3b62b32f 故障触发问题调整 2020-10-12 15:50:11 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
fan
37a47e4c9c 绘图问题调整 2020-10-10 13:12:24 +08:00
joylink_cuiweidong
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +08:00
lVAL
15a08feef8 补充优化键盘事件处理bug 2020-09-30 17:18:01 +08:00
lVAL
24326c4808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 14:57:19 +08:00
lVAL
ff3aa9bc45 补充修改card 复制粘贴的问题 2020-09-30 14:56:37 +08:00
joylink_cuiweidong
082144ee01 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:16:51 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
lVAL
1f14423567 修改 绘制card复制粘贴的bug 2020-09-30 09:54:26 +08:00
fan
d087505fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 09:42:34 +08:00
fan
abc2ef4e62 问题数据兼容调整 2020-09-28 09:42:20 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
zyy
be565e3711 调整道岔逻辑 2020-09-24 13:40:09 +08:00
fan
4eafbd72ea iscs调整&宁波道岔取消故障失表取消动画 2020-09-18 18:30:14 +08:00
zyy
e66a5a5687 调整道岔绘制逻辑 2020-09-18 11:08:17 +08:00
zyy
c2e3df8dbc 调整ibp按钮点击 2020-09-17 17:45:04 +08:00
zyy
e98b53d8ad 调整ibp鼠标逻辑 2020-09-17 16:33:22 +08:00
zyy
6eafb7883c 调整道岔绘制流程,ibp鼠标事件 2020-09-17 13:31:13 +08:00
zyy
3ce1418f89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 10:10:27 +08:00
zyy
4264996520 调整ibp数据,调整道岔生成逻辑 2020-09-16 10:10:13 +08:00
joylink_cuiweidong
0f5099221f 站台绘图代码调整 2020-09-15 18:28:32 +08:00
joylink_cuiweidong
10cae34098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:48:24 +08:00
joylink_cuiweidong
ca45d2ab98 代码调整 2020-09-15 17:48:08 +08:00
zyy
fdaf3eaa1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:41:10 +08:00
zyy
4b2939ff0a 调整区段配置 2020-09-15 17:40:57 +08:00
joylink_cuiweidong
619474b651 屏蔽门 绘图状态代码调整 2020-09-15 17:13:36 +08:00
joylink_cuiweidong
0b4fa8f3e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:09:07 +08:00
joylink_cuiweidong
ce2d07ea20 站台 屏蔽门 绘图代码调整 2020-09-15 17:08:28 +08:00
fan
b7a02f45c1 宁波三菜单 2020-09-14 18:34:56 +08:00
fan
40b12de294 会话调整 2020-09-11 17:57:48 +08:00
joylink_cuiweidong
feff7d50cc 屏蔽门 状态代码调整 2020-09-11 17:07:45 +08:00
fan
34fe136bcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 15:52:26 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
joylink_cuiweidong
b35bb2e6fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 14:14:08 +08:00
joylink_cuiweidong
2c74a91e2d 屏蔽门 绘图代码调整 2020-09-11 14:13:29 +08:00
zyy
50c9a4eabb 调整道岔生成 道岔区段问题 2020-09-11 10:18:07 +08:00
fan
03d4a28ab6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 17:42:10 +08:00
fan
281bbc32f8 宁波三菜单调整&表单记录页数 2020-09-09 17:41:51 +08:00
fan
06ecb8dd1a 宁波三菜单调整 2020-09-09 14:45:38 +08:00