Commit Graph

11614 Commits

Author SHA1 Message Date
fan
19f2b8c290 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:34:27 +08:00
dong
04a22ee760 拖拽超出时限制位置 2022-07-08 16:34:02 +08:00
fan
d2f7edbda1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:32:01 +08:00
fan
7be2c6b614 进路序列调整&站间透明暂提 2022-07-08 16:31:42 +08:00
Yuan
d19e8eb3d9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 15:30:58 +08:00
dong
c75d283389 调度命令添加校验功能 2022-07-08 14:56:33 +08:00
joylink_cuiweidong
d0f4c4b5cd 代码调整 2022-07-08 13:19:57 +08:00
dong
5b191b60b7 修改调度命令报错,添加中转识别号 2022-07-08 11:14:36 +08:00
Yuan
9d086724fe Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-07 18:14:11 +08:00
Yuan
8d38ee214e JD1A 皮肤修改 2022-07-07 18:14:03 +08:00
dong
998f5dbced 调度命令调整 2022-07-07 17:28:26 +08:00
joylink_cuiweidong
2bb6a88076 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 17:09:54 +08:00
joylink_cuiweidong
7f6a331002 大铁项目 ctc 行车日志 代码调整 2022-07-07 17:09:40 +08:00
dong
8cd5789bae 调度命令代码调整 2022-07-07 16:32:18 +08:00
joylink_cuiweidong
22e4935310 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:23:17 +08:00
joylink_cuiweidong
4f01e767d7 代码调整 2022-07-07 16:22:00 +08:00
fan
8c978c25a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:08:30 +08:00
fan
94f5c498c5 路票调整2 2022-07-07 16:08:04 +08:00
强 董
dafe5f75d3 调度命令下达提示修改 2022-07-07 16:00:03 +08:00
joylink_cuiweidong
1b564f5e6c 大铁项目 ctc 行车日志 代码调整 2022-07-07 15:44:13 +08:00
joylink_cuiweidong
5b171c0d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 15:29:49 +08:00
joylink_cuiweidong
9c9697d706 代码调整 2022-07-07 15:29:37 +08:00
强 董
a22736f0f0 调度命令调整 2022-07-07 15:14:42 +08:00
强 董
9f425fad49 调度命令调整 2022-07-07 15:03:41 +08:00
joylink_cuiweidong
cf7915cef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:59:47 +08:00
joylink_cuiweidong
651e7eceb5 大铁项目 调度台行车计划 列车类型 添加枚举
大铁项目 衬托出 行车日志 实际时间添加颜色
2022-07-07 13:58:57 +08:00
fan
607903c937 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:21:46 +08:00
fan
a692ae3aa7 路票调整 2022-07-07 13:21:27 +08:00
joylink_cuiweidong
cbe0203a66 大铁项目 调度台行车计划 修改到出入口 2022-07-06 18:00:48 +08:00
joylink_cuiweidong
1984dc807c 大铁项目 ctc 行车日志 清除闪烁 2022-07-06 17:26:59 +08:00
joylink_cuiweidong
5854fa5a60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 17:16:16 +08:00
joylink_cuiweidong
58ba63a382 大铁项目 ctc 行车日志 初始化 清空数据 2022-07-06 17:15:54 +08:00
joylink_cuiweidong
1d2cf1c043 大铁项目 调度台行车计划 修改时间 2022-07-06 16:23:40 +08:00
fan
026395d982 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
 Conflicts:
	src/store/modules/socket.js
2022-07-06 15:50:08 +08:00
fan
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +08:00
joylink_cuiweidong
00f1d98829 大铁项目 ctc 行车日志 增加 修改股道 发送计划 取消红闪 指令
修改 发送计划按钮闪烁的标识
2022-07-06 13:45:41 +08:00
fan
deda8eaf7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 11:19:46 +08:00
fan
1093b8982b 路票流程调整 2022-07-06 11:19:22 +08:00
Yuan
0a4bfa82ae Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 11:18:58 +08:00
joylink_cuiweidong
78c3e41f9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 10:42:14 +08:00
joylink_cuiweidong
84a4192183 代码调整 2022-07-06 10:41:40 +08:00
Yuan
e0e64340fc Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 09:30:27 +08:00
fan
2d4b0708bd 路票流程调整暂提 2022-07-05 18:03:14 +08:00
fan
012c8e7137 修复:因无法打开麦克风等错误导致的无法挂断电话BUG 2022-07-05 13:22:36 +08:00
fan
662b7a2332 增加仿真成员 车站助理 STATION_ASSISTANT 2022-07-05 10:59:58 +08:00
fan
a5b4b096f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-05 09:08:35 +08:00
fan
4779efbc23 代码调整&司机驾驶调整 2022-07-05 09:08:12 +08:00
joylink_cuiweidong
2d89a10eae 铁科院 大铁线路 添加 区段故障解锁 指令 2022-07-04 16:09:08 +08:00
强 董
8555ae081a 调度命令调整 2022-07-04 14:46:00 +08:00
强 董
e2b2f80e4d 调度命令代码调整 2022-07-04 14:28:06 +08:00