Commit Graph

6493 Commits

Author SHA1 Message Date
joylink_cuiweidong
3f11212183 剧本录制默认行调操作 2020-08-14 10:29:33 +08:00
joylink_cuiweidong
21401af2b3 代码调整 2020-08-13 18:31:23 +08:00
joylink_cuiweidong
ddabadba45 剧本仿真代码调整 2020-08-13 18:30:03 +08:00
joylink_cuiweidong
e3a76025e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 18:08:16 +08:00
sunzhenyu
02ba2797cd 修改三维故障获取 2020-08-13 18:08:04 +08:00
joylink_cuiweidong
75a240d66b 剧本预览代码调整 2020-08-13 18:07:43 +08:00
sunzhenyu
afbdc728c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 17:30:13 +08:00
sunzhenyu
debd9f54d0 修改三维沙盘哈尔滨静态文件,修改elmentui站台列表bug,修改影藏列车信息bug 2020-08-13 17:30:07 +08:00
joylink_cuiweidong
d01f8a9a9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 17:26:52 +08:00
joylink_cuiweidong
2615460674 剧本编制代码调整 2020-08-13 17:25:52 +08:00
sunzhenyu
41319d9543 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 16:51:01 +08:00
sunzhenyu
58366e737b 修改三维通号车站值班员钩锁 2020-08-13 16:50:54 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
joylink_cuiweidong
64a335cc05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 16:19:14 +08:00
joylink_cuiweidong
cd877b8800 剧本编制代码调整 2020-08-13 16:18:19 +08:00
sunzhenyu
6294b02990 修改三维vr下gui面板点击 2020-08-13 15:58:40 +08:00
sunzhenyu
165a84da5a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 15:55:33 +08:00
sunzhenyu
5b4db675a8 修改三维通号进入的界面,修改三维vr维修Gui 2020-08-13 15:55:25 +08:00
zyy
4b5b9776db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 15:41:51 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
joylink_cuiweidong
6a4cc3a2bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 13:05:34 +08:00
joylink_cuiweidong
af49d04f12 代码调整 2020-08-13 13:03:37 +08:00
fan
f22518f224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:23:31 +08:00
fan
cc0803630c 设备跳转运行图等(未完) 2020-08-13 11:23:07 +08:00
zyy
2e2feac47d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:03:43 +08:00
zyy
6e61050067 整合右键操作 2020-08-13 11:03:28 +08:00
joylink_cuiweidong
9c5a8238de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 10:47:19 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
fan
a97c1fcb74 iscs工作站仿真取消订阅问题调整 2020-08-13 09:40:40 +08:00
fan
066340930f 退出iscs工作站清理仿真 2020-08-13 09:22:31 +08:00
fan
f4f1b8792d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 09:07:54 +08:00
fan
2c2d704ee7 运行图预览重复数据调整 2020-08-13 09:07:42 +08:00
zyy
54bef31576 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 18:26:40 +08:00
zyy
36a0b1dd93 调整代码 2020-08-12 18:26:27 +08:00
joylink_cuiweidong
c3c65fba5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 17:34:55 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +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