Commit Graph

4652 Commits

Author SHA1 Message Date
fan
b56cbb47d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 14:45:37 +08:00
fan
56ed2a4f8c 调整更新坐标&联锁配置项 2020-05-11 14:45:07 +08:00
joylink_cuiweidong
7b00dac9be 剧本代码调整 2020-05-11 14:38:23 +08:00
joylink_cuiweidong
46f40bd381 剧本代码调整 2020-05-11 14:32:40 +08:00
joylink_cuiweidong
7ef7aa7768 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 13:59:15 +08:00
joylink_cuiweidong
2bc45b075e 剧本代码调整 2020-05-11 13:58:53 +08:00
fan
2a220b6fb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 13:25:19 +08:00
fan
115f1da928 批量生成区段逻辑始终端偏移量 2020-05-11 13:25:09 +08:00
joylink_cuiweidong
c8f858214c 剧本代码调整 2020-05-11 11:31:55 +08:00
joylink_cuiweidong
e5dca0b15b 新版剧本 代码调整 2020-05-11 10:44:00 +08:00
sunzhenyu
c8544909f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 10:14:04 +08:00
sunzhenyu
275e4bab27 修改三维设备页面道岔转辙机 2020-05-11 10:13:54 +08:00
joylink_zyy
942510398a 调整西安三号线导入 2020-05-10 22:36:31 +08:00
joylink_zyy
da08f98218 增加西安三号线皮肤 2020-05-10 22:27:35 +08:00
joylink_zyy
e62afeb9ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 22:20:29 +08:00
joylink_zyy
76eeb29014 增加西安三号线文件 2020-05-10 22:20:24 +08:00
joylink_fanyuhong
6b9dc0433b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 21:52:24 +08:00
joylink_fanyuhong
390af69821 接口注释 2020-05-10 21:52:13 +08:00
joylink_zyy
4d16abe984 注释综合监控请求 2020-05-10 21:51:44 +08:00
joylink_zyy
bcfba416d3 调整路径 2020-05-10 21:45:11 +08:00
joylink_zyy
5e142ae5b3 调整路径 2020-05-10 21:42:27 +08:00
joylink_zyy
9c2a65dda6 调整区段创建判断 2020-05-10 21:17:17 +08:00
joylink_zyy
15b7996cb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 20:43:43 +08:00
joylink_zyy
c65edfc06d 调整区段绘图逻辑 2020-05-10 20:43:37 +08:00
joylink_fanyuhong
6cf999deee 列车调整 2020-05-10 20:43:21 +08:00
joylink_fanyuhong
14fa56f768 列车调整 2020-05-10 17:04:49 +08:00
joylink_fanyuhong
292d6d1327 列车调整 2020-05-10 16:51:28 +08:00
joylink_fanyuhong
b732a00eb0 列车删除日志 2020-05-10 16:03:45 +08:00
joylink_fanyuhong
bf3af7cd65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 16:01:05 +08:00
joylink_fanyuhong
a64373e9b7 列车调整 2020-05-10 16:00:55 +08:00
joylink_zyy
fa70eb85ca 注释iscs事件 2020-05-10 15:58:08 +08:00
fan
ecf816d32a 地图数据维护中提示调整 2020-05-09 20:27:41 +08:00
fan
f57bf47c7c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 20:25:18 +08:00
fan
1601b655d1 地图数据维护中提示调整 2020-05-09 20:24:59 +08:00
joylink_cuiweidong
5b0d16c920 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 20:21:43 +08:00
joylink_cuiweidong
b5a3a195f7 代码调整 2020-05-09 20:21:20 +08:00
zyy
3212b4362b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 20:13:53 +08:00
zyy
fe5f6cecc9 调整大屏系统界面加载宽度 2020-05-09 20:13:32 +08:00
fan
c5f63c9e52 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:35:56 +08:00
fan
fc68903ff5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 19:24:22 +08:00
fan
29881aab0b 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:24:12 +08:00
zyy
1d2e835b85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 18:48:30 +08:00
zyy
d90996da48 调整大屏系统行数放到配置 2020-05-09 18:48:08 +08:00
joylink_cuiweidong
81450fbc9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 18:24:37 +08:00
fan
f16936d9c3 信号机接近区段 2020-05-09 18:24:35 +08:00
joylink_cuiweidong
13ae9eba9c 代码调整 2020-05-09 18:24:21 +08:00
joylink_cuiweidong
9796280970 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:49:40 +08:00
joylink_cuiweidong
de024b9a45 代码调整 2020-05-09 17:49:25 +08:00
fan
d761c287af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:32:29 +08:00
fan
e50edafb0c 校验调整 2020-05-09 17:32:13 +08:00