Commit Graph

6981 Commits

Author SHA1 Message Date
fan
65cb35036d local-test打包调整 2022-07-15 16:23:38 +08:00
fan
c188d28caf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 16:16:07 +08:00
fan
f43a29fd11 长兴技术学校登录页 2022-07-15 16:15:58 +08:00
fan
636803400a 画面调整 2022-07-15 15:55:03 +08:00
joylink_cuiweidong
bb193a7e5d 代码调整 2022-07-15 14:44:44 +08:00
Yuan
505c0ae95d resolve conflict 2022-07-15 10:21:21 +08:00
Yuan
acb63a1a8a stage 2022-07-15 10:19:15 +08:00
fan
1d6997db39 画面调整暂提 2022-07-15 09:57:03 +08:00
fan
b5a67f7fbe 车务终端非常站控模式下 不能操作 2022-07-14 18:13:46 +08:00
fan
dd935f0aec 添加地图功能配置项 2022-07-14 11:08:02 +08:00
fan
11d75a76a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 17:31:23 +08:00
fan
6d34c5fde6 站间透明问题修复2 2022-07-13 17:31:10 +08:00
joylink_cuiweidong
e21ea808e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:43:49 +08:00
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
ed4d2f9e73 大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】 2022-07-12 14:42:52 +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
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +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
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
dong
998f5dbced 调度命令调整 2022-07-07 17:28:26 +08:00
dong
8cd5789bae 调度命令代码调整 2022-07-07 16:32:18 +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
强 董
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
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
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +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
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