Commit Graph

3180 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
fff6930df8 宁波线 道岔代码调整 2020-02-11 10:57:13 +08:00
joylink_cuiweidong
91a5bb6b7a 代码调整 2020-02-11 10:04:14 +08:00
joylink_cuiweidong
9af8a70242 代码调整 2020-02-11 10:03:59 +08:00
joylink_fanyuhong
c1dabeae80 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-10 19:10:55 +08:00
joylink_fanyuhong
50a4f8ab0b 成都三号线调整 2020-02-10 19:10:43 +08:00
joylink_cuiweidong
ce909e6e24 成都一号线指令操作代码调整 2020-02-10 17:44:01 +08:00
joylink_cuiweidong
56ab4a63d0 新版北京一号线指令代码调整 2020-02-10 17:17:33 +08:00
joylink_cuiweidong
5b2f27ab86 新版北京一号线指令操作代码修改 2020-02-10 17:04:20 +08:00
zyy
f82dfa53ff 调整宁波一号线传参字段 2020-02-10 17:02:00 +08:00
zyy
f06bab2f1c 增加虚拟信号机显示图形 2020-02-10 16:43:58 +08:00
zyy
b73b81d212 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-10 16:27:52 +08:00
zyy
e884f3adc6 新增创建运行图表单 2020-02-10 16:27:43 +08:00
joylink_cuiweidong
73ee89f299 iscs 代码调整 2020-02-10 11:17:51 +08:00
zyy
7b9f378315 调整cdn 加载路径 2020-02-10 10:50:18 +08:00
joylink_cuiweidong
b3c68bf751 iscs 代码调整 2020-02-07 22:10:55 +08:00
joylink_cuiweidong
974e0ecc0d iscs 代码调整 2020-02-07 20:09:51 +08:00
joylink_cuiweidong
416766cb3e iscs 绘图显示 2020-02-07 20:02:36 +08:00
joylink_cuiweidong
a11556643a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 19:53:50 +08:00
joylink_cuiweidong
67b45bea50 iscs 绘图数据代码调整 2020-02-07 19:53:05 +08:00
joylink_cuiweidong
222462d289 iscs 绘图代码调整 2020-02-07 19:12:35 +08:00
joylink_fanyuhong
60d6ab5db9 iscs调整 2020-02-07 18:59:48 +08:00
joylink_fanyuhong
789d9c8be9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 18:40:26 +08:00
joylink_fanyuhong
13e2e69368 iscs调整 2020-02-07 18:40:16 +08:00
zyy
ef03e10b5a desc: 调整数据 2020-02-07 18:38:00 +08:00
zyy
13fcc80c41 desc: 增加状态 2020-02-07 18:19:56 +08:00
joylink_cuiweidong
f944e90380 iscs acs 门禁站台层绘图数据调整 2020-02-07 16:16:36 +08:00
joylink_cuiweidong
7994b79594 ISCS 绘图数据修改 2020-02-07 15:34:59 +08:00