fan
|
6b585fbca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 14:42:27 +08:00 |
|
fan
|
0d31203b74
|
ibp盘状态处理&时间同步
|
2020-09-18 14:42:17 +08:00 |
|
zyy
|
733503afe6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 11:08:30 +08:00 |
|
zyy
|
e66a5a5687
|
调整道岔绘制逻辑
|
2020-09-18 11:08:17 +08:00 |
|
sunzhenyu
|
af322ec7aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 09:26:50 +08:00 |
|
sunzhenyu
|
a37a3214f8
|
修改三维通号读取新数据bug
|
2020-09-18 09:26:44 +08:00 |
|
fan
|
89fcb3fe2f
|
iscs调整&ibp接口参数修改
|
2020-09-18 09:26:25 +08:00 |
|
fan
|
aa52945003
|
行调大赛
|
2020-09-17 18:30:31 +08:00 |
|
fan
|
639dc474a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:25:52 +08:00 |
|
fan
|
f7e350ca95
|
行调大赛理论考试&福州Iscs
|
2020-09-17 18:25:37 +08:00 |
|
sunzhenyu
|
c7e0380510
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:12:42 +08:00 |
|
sunzhenyu
|
d409476963
|
增加三维沙盘行车高度行驶数据更新，修改三维设备站台贴图获取，修改三维编辑器区段连接获取
|
2020-09-17 18:12:37 +08:00 |
|
zyy
|
c2e3df8dbc
|
调整ibp按钮点击
|
2020-09-17 17:45:04 +08:00 |
|
zyy
|
3134142ab3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 16:33:33 +08:00 |
|
zyy
|
e98b53d8ad
|
调整ibp鼠标逻辑
|
2020-09-17 16:33:22 +08:00 |
|
sunzhenyu
|
465248872f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:41:02 +08:00 |
|
sunzhenyu
|
308007c6b1
|
修改三维cctv初始化渲染大小
|
2020-09-17 15:40:55 +08:00 |
|
fan
|
28e9bf2dae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:37:01 +08:00 |
|
fan
|
588f77173a
|
行调大赛理论考试&福州Iscs
|
2020-09-17 15:36:46 +08:00 |
|
joylink_cuiweidong
|
5428f98843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jlmap3d/passflow/jl3dpassflow.vue
|
2020-09-17 15:23:14 +08:00 |
|
joylink_cuiweidong
|
e93755a29f
|
哈尔滨 真实摄像头添加（暂时不能播放）
|
2020-09-17 15:19:00 +08:00 |
|
zyy
|
b6f2de4d0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 13:31:26 +08:00 |
|
zyy
|
6eafb7883c
|
调整道岔绘制流程，ibp鼠标事件
|
2020-09-17 13:31:13 +08:00 |
|
fan
|
f586cced67
|
行调大赛理论考试
|
2020-09-17 09:50:52 +08:00 |
|
fan
|
7dc936a0ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 09:01:38 +08:00 |
|
fan
|
0abd0aaba5
|
福建综合监控
|
2020-09-17 09:01:22 +08:00 |
|
zyy
|
8c9f18f239
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:53:44 +08:00 |
|
zyy
|
4edcbdf929
|
调整ibp盘操作流程
|
2020-09-16 17:53:33 +08:00 |
|
sunzhenyu
|
22db894742
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:10:47 +08:00 |
|
sunzhenyu
|
86f49506cd
|
修改三维编辑器连接区段数据。增加三维编辑器邻接区段对齐功能，增加区段高低编辑功能。修改三维cctv配置
|
2020-09-16 17:10:37 +08:00 |
|
zyy
|
309296cb63
|
调整区段逻辑
|
2020-09-16 15:03:45 +08:00 |
|
zyy
|
24266de0f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 14:26:17 +08:00 |
|
zyy
|
64c322751c
|
调整ibp盘流程
|
2020-09-16 14:26:04 +08:00 |
|
fan
|
8a52561c66
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:49:46 +08:00 |
|
fan
|
e5d83555af
|
添加大赛练习
|
2020-09-16 10:49:16 +08:00 |
|
zyy
|
3ce1418f89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:10:27 +08:00 |
|
zyy
|
4264996520
|
调整ibp数据，调整道岔生成逻辑
|
2020-09-16 10:10:13 +08:00 |
|
joylink_cuiweidong
|
0f5099221f
|
站台绘图代码调整
|
2020-09-15 18:28:32 +08:00 |
|
joylink_cuiweidong
|
10cae34098
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:48:24 +08:00 |
|
joylink_cuiweidong
|
ca45d2ab98
|
代码调整
|
2020-09-15 17:48:08 +08:00 |
|
zyy
|
fdaf3eaa1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:41:10 +08:00 |
|
zyy
|
4b2939ff0a
|
调整区段配置
|
2020-09-15 17:40:57 +08:00 |
|
joylink_cuiweidong
|
619474b651
|
屏蔽门 绘图状态代码调整
|
2020-09-15 17:13:36 +08:00 |
|
joylink_cuiweidong
|
0b4fa8f3e0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:09:07 +08:00 |
|
joylink_cuiweidong
|
ce2d07ea20
|
站台 屏蔽门 绘图代码调整
|
2020-09-15 17:08:28 +08:00 |
|
fan
|
b44e193bcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-14 18:35:06 +08:00 |
|
fan
|
b7a02f45c1
|
宁波三菜单
|
2020-09-14 18:34:56 +08:00 |
|
zyy
|
072a6282b0
|
调整ibp绘图流程
|
2020-09-14 10:59:02 +08:00 |
|
zyy
|
81ec8fd6a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 18:23:24 +08:00 |
|
zyy
|
e2b212e277
|
调整字段
|
2020-09-11 18:23:12 +08:00 |
|