Commit Graph

11541 Commits

Author SHA1 Message Date
joylink_cuiweidong
a049a67571 大铁项目 ctc 行车日志 代码调整 2022-07-13 16:43:15 +08:00
fan
a6ce3b106a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:41:06 +08:00
fan
e1b7f84ea6 站间透明问题修复 2022-07-13 16:40:49 +08:00
joylink_cuiweidong
f6bc53b0d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 15:55:25 +08:00
joylink_cuiweidong
9a7fcd5697 大铁项目 行车日志 添加/修改 运行计划 2022-07-13 15:53:55 +08:00
fan
50921e2348 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 14:19:23 +08:00
fan
895b909e34 站间透明调整 2022-07-13 14:19:02 +08:00
dong
42cb9d6ee2 添加教学通用项目 2022-07-13 13:33:41 +08:00
joylink_cuiweidong
e9fc978c06 大铁项目 ctc 行车日志 设置超限 2022-07-12 15:49:02 +08:00
joylink_cuiweidong
ed4d2f9e73 大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】 2022-07-12 14:42:52 +08:00
Yuan
71ce383912 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-12 14:01:32 +08:00
Yuan
36c5e3c7db WIP: JD1A 底部操作栏左侧显隐控制部分 2022-07-12 14:01:08 +08:00
joylink_cuiweidong
aaa2cdb557 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-12 11:29:27 +08:00
joylink_cuiweidong
5aed3a7c06 大铁项目 ctc 行车日志 设置始发 设置终到 2022-07-12 11:29:15 +08:00
weizhihong
03e8b90893 【运行计划时间自动变化】 2022-07-11 15:02:31 +08:00
fan
e300d62896 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:45:21 +08:00
fan
e59e2ec8d4 股道视图调整 2022-07-08 17:45:07 +08:00
joylink_cuiweidong
548e737cfd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:39:06 +08:00
joylink_cuiweidong
553ac965ba 大铁项目 ctc 行车日志 设置/取消重点列车 设置允许股道与基本路径不一致 设置进出入口不一致 指令添加 2022-07-08 17:38:47 +08:00
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
0bf64a3bed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:16:21 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +08:00
dong
9890752f84 修改拖拽窗口选中文本问题 2022-07-08 17:11:30 +08:00
joylink_cuiweidong
b437e9079a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:52:37 +08:00
joylink_cuiweidong
af992f8664 大铁项目 ctc 行车日志 取消到达 取消出发 取消闭塞 指令添加 2022-07-08 16:52:06 +08:00
Yuan
eb2447c69a Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 16:43:55 +08:00
Yuan
178d550db6 bugfix - 判断条件不完整 2022-07-08 16:43:52 +08:00
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