Commit Graph

6030 Commits

Author SHA1 Message Date
zyy
17158401de 调整综合监控导航栏 2020-06-17 09:16:03 +08:00
joylink_cuiweidong
4fb17151df 佛山有轨电车操作代码调整 2020-06-17 09:01:18 +08:00
program-walker
cb11d67476 Merge remote-tracking branch 'origin/test' 2020-06-16 19:22:49 +08:00
fan
6cc44b5528 合并代码 2020-06-16 18:38:21 +08:00
fan
3b171130f9 福州列车显示调整&表单组件button增加loading 2020-06-16 18:36:18 +08:00
sunzhenyu
e7a9b8f737 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 18:18:56 +08:00
sunzhenyu
e415dc28c0 修改三维驾驶mmi车门显示和控制面板关门灯 2020-06-16 18:18:47 +08:00
zyy
73338a7eaa 增加宁波线路车站折返逻辑 2020-06-16 17:49:55 +08:00
zyy
6d7c75e5f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 16:39:20 +08:00
zyy
7f242ba443 调整综合监控绘图元素, 调整按图折返配置 2020-06-16 16:39:07 +08:00
fan
d0e862823a 控制模式转换调整 2020-06-16 15:33:38 +08:00
program-walker
e03e85939d Merge remote-tracking branch 'origin/test' 2020-06-16 15:20:22 +08:00
program-walker
6a4ba66b0e Merge remote-tracking branch 'origin/test' 2020-06-16 15:17:55 +08:00
fan
5462b24c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 15:10:47 +08:00
fan
a6ff101a6e 竞业达页面调整 2020-06-16 15:10:39 +08:00
zyy
53823aea04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 15:02:00 +08:00
zyy
f62de1971f 增加宁波线路 站后折返皮肤配置 2020-06-16 15:01:29 +08:00
fan
5ecb65a577 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 14:53:08 +08:00
fan
db98a53907 福州道岔&列车操作 2020-06-16 14:52:57 +08:00
zyy
10502988a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 14:45:50 +08:00
zyy
dfdbddad2b 调整综合监控数据,调整地图绘制功能按钮显示状态逻辑判断 2020-06-16 14:45:34 +08:00
fan
2e5b07d7e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 13:56:47 +08:00
fan
5292afe4dd 宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整(未完) 2020-06-16 13:56:33 +08:00
sunzhenyu
3d95103199 修改三维西安隧道模型 2020-06-16 13:36:38 +08:00
sunzhenyu
33343f6447 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 13:17:30 +08:00
sunzhenyu
a2c2a963a4 增加三维驾驶关车门亮灯,修改三维道岔转辙机动画速度,修改三维仿真驾驶中车站模型增加图片资源 2020-06-16 13:17:11 +08:00
fan
35b6d9093a 地图绘制信号机添加属性noOverlap是否无延续保护 2020-06-16 09:50:39 +08:00
fan
ae0a6d6dcd 福州一号线:站台详情 2020-06-16 09:32:19 +08:00
fan
2f81b142f3 宁波一号线设置头码车放开服务号输入框 2020-06-16 09:03:06 +08:00
fan
271ef9dc11 添加通用配置项noParkingSM,parkingSM 2020-06-15 18:37:48 +08:00
fan
38a5aeec67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-15 18:00:39 +08:00
fan
f60e69f8ff 福州车站站台操作&西安车站站台操作调整 2020-06-15 18:00:24 +08:00
zyy
28cc15fd10 调整综合监控数据,调整系统右键菜单样式 2020-06-15 17:16:26 +08:00
zyy
0f33f9d876 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-15 16:13:51 +08:00
zyy
428967e843 调整地图绘制右键菜单样式,调整道岔触发居中,绘制综合监控数据 2020-06-15 16:13:28 +08:00
fan
c4ce6ae0f9 线路管理添加配置项-ctcOverlapOnlyTurnBackStationLock 2020-06-15 14:33:38 +08:00
fan
3c9dd88e31 福州线路信号机调整 2020-06-15 14:26:31 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
fan
3f978a2aa8 竞业达页面调整 2020-06-15 13:03:24 +08:00
fan
2f51f2362b 调整西安列车车头三角宽度 2020-06-15 10:41:27 +08:00
fan
42d9e058a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-15 10:05:38 +08:00
fan
a732b9c19b 添加竞业达登录页面 2020-06-15 10:05:27 +08:00
zyy
1132043e13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 18:31:11 +08:00
zyy
5622cc5216 调整公共地图右键菜单样式 2020-06-12 18:30:50 +08:00
joylink_cuiweidong
d237d45117 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 18:29:33 +08:00
joylink_cuiweidong
3248f3badf 剧本代码调整 2020-06-12 18:29:14 +08:00
fan
e4008afff1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 18:28:48 +08:00
fan
98bdbc43ab 福州信号机操作调整 2020-06-12 18:28:32 +08:00
joylink_cuiweidong
3944f743c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 17:44:43 +08:00
joylink_cuiweidong
de8bbcf2bb 剧本代码调整 2020-06-12 17:44:18 +08:00