Commit Graph

3477 Commits

Author SHA1 Message Date
joylink_fanyuhong
de7a47d0f4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-13 13:12:31 +08:00
joylink_fanyuhong
720125cfa5 列车调整 2020-02-13 13:12:22 +08:00
zyy
f82c4a195e 调整创建运行图表单数据 2020-02-13 12:35:44 +08:00
joylink_cuiweidong
9115155865 新版北京一号线 新建计划车指令代码修改 2020-02-13 12:33:54 +08:00
zyy
e5f78fd3e3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-13 12:14:49 +08:00
zyy
42c11d0b7c 修改创建运行图表单 2020-02-13 12:14:39 +08:00
joylink_fanyuhong
76c09d6e26 列车调整 2020-02-13 11:56:06 +08:00
joylink_fanyuhong
a9c16c3c74 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-13 11:19:17 +08:00
joylink_fanyuhong
147796dca1 操作调整 2020-02-13 11:19:06 +08:00
joylink_cuiweidong
5721f17cf9 北京线 车次窗 新建列车代码调整 2020-02-12 18:57:02 +08:00
joylink_fanyuhong
fa233a7031 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 18:37:32 +08:00
joylink_fanyuhong
4c1b03e3d7 操作调整 2020-02-12 18:37:24 +08:00
joylink_cuiweidong
926f82b04c 北京一号线车次窗新建计划车 2020-02-12 18:19:21 +08:00
joylink_fanyuhong
b1ecd2c733 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 18:08:39 +08:00
joylink_fanyuhong
a147530248 操作调整 2020-02-12 18:08:31 +08:00
zyy
b81f6fc967 宁波一号线右键操作 2020-02-12 18:06:30 +08:00
joylink_fanyuhong
4314698849 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 17:48:42 +08:00
joylink_fanyuhong
dcb1779297 操作调整 2020-02-12 17:48:30 +08:00
zyy
d22f2582c3 增加车次窗右键操作 2020-02-12 17:43:18 +08:00
joylink_fanyuhong
c4b37c1519 操作调整 2020-02-12 16:22:44 +08:00
joylink_fanyuhong
5fe9d4c03a 操作调整 2020-02-12 16:06:24 +08:00
joylink_fanyuhong
5141c18446 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 15:46:58 +08:00
joylink_fanyuhong
5050392b2b 操作调整 2020-02-12 15:46:50 +08:00
joylink_cuiweidong
eb6e12d72c 成都一号线 操作代码调整 2020-02-12 15:41:46 +08:00
joylink_fanyuhong
1b0654a3b8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 15:14:23 +08:00
joylink_fanyuhong
4275b4dc4a 操作调整 2020-02-12 15:14:14 +08:00
joylink_cuiweidong
39f445ac3b iscs 系统代码调整 2020-02-12 14:52:50 +08:00
joylink_cuiweidong
e04e7a2f32 代码合并 2020-02-12 10:58:40 +08:00
joylink_fanyuhong
244b30d1c8 成都三调整 2020-02-12 10:29:48 +08:00
joylink_fanyuhong
a95e0176ac Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 18:27:07 +08:00
joylink_fanyuhong
97320cc8ca 成都三调整 2020-02-11 18:26:45 +08:00
zyy
b50aa876bb 调整代码 2020-02-11 18:10:15 +08:00
zyy
8ad4316816 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 17:33:47 +08:00
zyy
d348c640f9 添加宁波,北京线路进路获取 2020-02-11 17:33:33 +08:00
joylink_fanyuhong
b529b0ad94 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 17:29:42 +08:00
joylink_fanyuhong
e7a9c09e50 成都三调整 2020-02-11 17:29:25 +08:00
joylink_cuiweidong
4e9510f535 成都一号线指令操作代码调整 2020-02-11 17:02:49 +08:00
zyy
977fe574eb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 16:16:15 +08:00
zyy
4ca7af6b0a 设置数据更新中间层 2020-02-11 16:16:04 +08:00
joylink_fanyuhong
3692668b35 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 15:59:18 +08:00
joylink_fanyuhong
86c6ac4a57 进路选中切除状态调整 2020-02-11 15:58:54 +08:00
joylink_cuiweidong
fd960d2155 宁波一号线,成都三号线 道岔 定操和反操代码调整 2020-02-11 15:32:48 +08:00
joylink_fanyuhong
9c5b486cc1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 15:24:30 +08:00
joylink_fanyuhong
b448cad3c9 道岔状态调整 2020-02-11 15:24:17 +08:00
zyy
e5adb93315 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 14:51:11 +08:00
zyy
fbcaacce01 修改代码添加中间状态转换层 2020-02-11 14:50:56 +08:00
joylink_fanyuhong
80ced774b3 道岔状态调整 2020-02-11 11:35:03 +08:00
joylink_fanyuhong
abffb7c63a 道岔状态调整 2020-02-11 11:32:19 +08:00
joylink_fanyuhong
735eccc71e 合并代码 2020-02-11 11:04:20 +08:00
joylink_fanyuhong
56d93a2f73 区段信号机调整 2020-02-11 11:02:35 +08:00