Commit Graph

11622 Commits

Author SHA1 Message Date
fan
f702119f07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-22 11:20:42 +08:00
fan
3f7696e157 大铁二号线点灯灭灯调整 2022-07-22 11:20:24 +08:00
fan
a2ccd82208 画面切换处理不同线路私有属性 2022-07-22 10:16:30 +08:00
fan
2c770a5bcc 暂提 2022-07-21 18:12:28 +08:00
joylink_cuiweidong
a9bd7ef945 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-21 17:25:59 +08:00
joylink_cuiweidong
8279ea9b39 大铁线路III型 信号机 添加 总人解指令 2022-07-21 17:25:40 +08:00
dong
13df1ba98d 信号加封解封 2022-07-21 17:17:31 +08:00
joylink_cuiweidong
5909f738f7 大铁项目 ctc 修改 改方、闭塞等操作 调整 2022-07-21 16:57:09 +08:00
joylink_cuiweidong
1deb1e017d 代码调整 2022-07-21 15:08:07 +08:00
joylink_cuiweidong
891cf8761c 代码调整 2022-07-21 11:25:21 +08:00
fan
6794e6370f 大铁二号线故障名称调整 2022-07-21 11:08:48 +08:00
fan
f6a5512cfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-21 10:15:12 +08:00
fan
15e8006f5a ctc=>车务终端 2022-07-21 10:14:29 +08:00
joylink_cuiweidong
80408014fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 18:20:37 +08:00
joylink_cuiweidong
a63827cd62 大铁线路III型 信号机 延时解锁 状态调整 2022-07-20 18:20:26 +08:00
fan
43ae2bd1fb 语音合成调整 2022-07-20 17:20:32 +08:00
fan
0c34aa9163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 15:07:13 +08:00
fan
172415dccf 显示配置调整 2022-07-20 15:07:02 +08:00
joylink_cuiweidong
4ab68d8731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 14:40:16 +08:00
joylink_cuiweidong
20cf7de453 大铁线路III型 道岔 设置分路不良 取消分路不良 区段故障解锁 2022-07-20 14:39:57 +08:00
fan
e332f91eae ctc 非常站控下限制操作 2022-07-20 14:08:33 +08:00
fan
68bd166d27 车站发车预告语音播报 2022-07-20 13:14:08 +08:00
fan
3f07b9f554 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-20 10:05:52 +08:00
fan
b9ceb3a22a 长兴技术=》长兴技师 2022-07-20 10:05:22 +08:00
fan
ac6f16b360 语音播报暂提 2022-07-20 10:03:33 +08:00
joylink_cuiweidong
751733c450 大铁线路III型 道岔 道岔封锁 单锁 侧防 引导总锁 代码调整 2022-07-20 09:34:04 +08:00
joylink_cuiweidong
b6f4fc611f 大铁线路III型 道岔 挤岔状态代码调整 道岔名称代码调整 2022-07-19 17:14:52 +08:00
joylink_cuiweidong
45e6c90be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 16:53:54 +08:00
joylink_cuiweidong
dd1b7b934e 大铁线路III型 定反位 实心小圆圈 失表状态调整 2022-07-19 16:53:37 +08:00
dong
e3c04e96a3 调度命令查询界面功能 2022-07-19 14:50:52 +08:00
joylink_cuiweidong
226f0fd71b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 14:04:08 +08:00
joylink_cuiweidong
a6bed94153 修改 特殊侵限分隔符 的绘制代码 2022-07-19 14:03:48 +08:00
fan
3d9419b809 指示灯关联必填调整 2022-07-19 13:41:55 +08:00
fan
93930bb8c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 10:09:07 +08:00
fan
19ff4db593 信号按钮调整 2022-07-19 10:08:40 +08:00
joylink_cuiweidong
efab2fb9f2 大铁项目 ctc 行车日志 代码调整 2022-07-18 17:49:13 +08:00
joylink_cuiweidong
deece104b1 大铁项目 ctc 运行图初始化信息 改完通过接口拉取 2022-07-18 17:18:55 +08:00
joylink_cuiweidong
4b1c1aae49 TYJL-III型 区段 添加 分路不良标记 2022-07-18 16:37:08 +08:00
joylink_cuiweidong
d67b390b46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 16:19:01 +08:00
joylink_cuiweidong
4583733127 大铁项目 切换角色 ctc 行车日志 数据切换 2022-07-18 16:17:53 +08:00
fan
fa3c110fbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 15:05:49 +08:00
fan
46ab43aef3 车务终端分散自律亮灯&占线板默认选中 2022-07-18 15:01:35 +08:00
joylink_cuiweidong
953b63bd1a 代码调整 2022-07-18 13:49:24 +08:00
joylink_cuiweidong
b3e3dd7898 代码调整 2022-07-18 13:22:48 +08:00
fan
2011f1838c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 13:08:01 +08:00
fan
e176823ec6 占线板&进路序列调整 2022-07-18 13:07:45 +08:00
Yuan
fbf6e5fa2c resolve conflict 2022-07-15 18:10:37 +08:00
Yuan
0943fc515d bugfix 2022-07-15 17:19:35 +08:00
fan
bfc336fb4c 长兴技校三方登录配置 2022-07-15 17:12:49 +08:00
fan
470c223a59 环境参数判断调整 2022-07-15 16:57:17 +08:00