Commit Graph

6458 Commits

Author SHA1 Message Date
fan
2c2d704ee7 运行图预览重复数据调整 2020-08-13 09:07:42 +08:00
fan
fbda89c39e iscs调整 2020-08-12 15:19:38 +08:00
fan
0348d143b5 合并代码 2020-08-12 11:04:04 +08:00
fan
30e30d5ef3 佛山线路问题调整&iscs样式调整 2020-08-12 11:02:47 +08:00
joylink_cuiweidong
55911240b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 10:03:14 +08:00
joylink_cuiweidong
1f0aaffe6f 佛山有轨电车信号机优化(全线信号机设置成图样类型) 2020-08-12 10:02:56 +08:00
zyy
0e36937718 添加区段操作 2020-08-12 10:02:19 +08:00
zyy
2d5f4520d4 增加佛山线路 强制取消扣车 2020-08-12 09:50:10 +08:00
zyy
3731a56a78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 15:46:26 +08:00
zyy
09b151e830 调整地图绘制流程 2020-08-11 15:46:15 +08:00
fan
6f4b6f0c3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 14:34:27 +08:00
fan
8687650e41 ibp系统调整&发布地图管理调整 2020-08-11 14:34:17 +08:00
joylink_cuiweidong
c82edc8516 地图绘图代码调整 2020-08-11 14:17:00 +08:00
joylink_cuiweidong
be112d3b96 代码调整 2020-08-11 13:34:55 +08:00
joylink_cuiweidong
b0f238c655 地图绘制代码调整 2020-08-11 13:13:38 +08:00
joylink_cuiweidong
15ecca61a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 10:57:41 +08:00
joylink_cuiweidong
740757896b 地图绘制代码调整 2020-08-11 10:57:20 +08:00
fan
e40032a24e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 09:21:43 +08:00
fan
775847029a 模板运行图添加仿真数据校验(接口未加) 2020-08-11 09:21:31 +08:00
zyy
05d650efa6 删除注释 2020-08-11 09:11:38 +08:00
zyy
0f4fa8feab 修改代码 2020-08-10 18:38:16 +08:00
zyy
20706dd67f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 18:37:43 +08:00
zyy
a2f9e18847 调整地图导出流程 2020-08-10 18:37:34 +08:00
joylink_cuiweidong
662ea6c87b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 18:23:35 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00
fan
870ee5130f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 17:40:33 +08:00
fan
a0bd7a309d 整合申请管理 2020-08-10 17:40:17 +08:00
joylink_cuiweidong
d03532ecea 剧本预览和加载剧本 添加指令提示 2020-08-10 16:29:32 +08:00
joylink_cuiweidong
76bf1706ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 15:55:01 +08:00
joylink_cuiweidong
11dc3abf42 剧本编制代码调整(剧本编制对应的会话逻辑调整) 2020-08-10 15:54:38 +08:00
zyy
a4beb31ee6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 13:02:11 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
joylink_cuiweidong
4b11c2e28f 剧本编制代码调整 2020-08-10 09:47:01 +08:00
joylink_cuiweidong
69e224be35 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 19:03:20 +08:00
joylink_cuiweidong
3c301b93ce 剧本编制 添加指令 代码 2020-08-07 19:02:59 +08:00
fan
9bb0af959a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 18:28:55 +08:00
fan
a5ee8ebed2 问题调整 2020-08-07 18:28:40 +08:00
joylink_cuiweidong
fd6360611b 福州一号线,西安三号线控制权转移代码调整 2020-08-07 18:20:45 +08:00
joylink_cuiweidong
c4c1f79258 控制权转移代码调整 2020-08-07 17:33:12 +08:00
joylink_cuiweidong
ed6694a080 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 17:13:35 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
sunzhenyu
ba6797bbda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 15:19:07 +08:00
sunzhenyu
51c2bb296f 修改三维cctv寻路路径地址 2020-08-07 15:19:01 +08:00
joylink_cuiweidong
18f2265e36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:12:45 +08:00
joylink_cuiweidong
fda52feb52 代码调整 2020-08-07 14:12:32 +08:00
fan
521a75df32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:09:10 +08:00
fan
115f5a539f 有扣车跳停显示状态时调整菜单位置 2020-08-07 14:09:00 +08:00
joylink_cuiweidong
9e9e7dbed3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:01:05 +08:00
joylink_cuiweidong
cc6bbe8073 北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整 2020-08-07 14:00:32 +08:00
fan
dcfd07c267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 13:59:29 +08:00