Commit Graph

8981 Commits

Author SHA1 Message Date
lVAL
396d7ec14e 修改南京2号线菜单配置方式 2021-01-19 10:31:31 +08:00
lVAL
267a815956 修改南京2按钮配置 2021-01-19 09:54:45 +08:00
joylink_cuiweidong
05a8c85d6b 代码调整 2021-01-19 09:20:37 +08:00
joylink_cuiweidong
4cbc3de4ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 18:06:23 +08:00
joylink_cuiweidong
ba80512efa 南京二号线 站台添加 月台 按钮 2021-01-18 18:06:08 +08:00
sunzhenyu
19cede5338 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 17:59:14 +08:00
sunzhenyu
2463d09bcc 修改三维驾驶更新本地客户端驾驶员 2021-01-18 17:59:04 +08:00
fan
07ad4c85dd 被覆盖代码重新提交 2021-01-18 17:41:46 +08:00
lVAL
b156097cba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
2021-01-18 17:35:19 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后,页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
fan
f18c48ffa8 南京二号线初始获取车站调整&计轴占用状态调整 2021-01-18 17:24:00 +08:00
fan
057687a678 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 16:57:03 +08:00
lVAL
9617c36d01 修改控制模式 disabled 控制 2021-01-18 16:53:54 +08:00
fan
1ba5d404b5 南京二号线进路锁闭封锁状态调整 2021-01-18 16:51:45 +08:00
fan
58f1bc5950 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 16:22:38 +08:00
fan
cff6a78d3a 南京二号线行调点击空白关闭 2021-01-18 16:22:26 +08:00
lVAL
198602923c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:49:00 +08:00
lVAL
7d61451fa9 修改 应答器 创建的几个优化问题,以及南京线路中心左键弹窗,右键不弹 2021-01-18 15:48:05 +08:00
fan
14091957d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:41:43 +08:00
fan
5f3300e889 信号机添加所属车站&批量设置 2021-01-18 15:41:28 +08:00
joylink_cuiweidong
d322aad5d4 南京二号线 站台安全门 通信正常开启状态 调整 2021-01-18 15:16:00 +08:00
fan
6aea2334e6 南京二号线 控制模式none 车站字体闪烁 2021-01-18 14:10:55 +08:00
joylink_cuiweidong
74b9c8cc7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 13:40:29 +08:00
joylink_cuiweidong
5687ffc5a8 南京二号线 区段 轨区设限 代码调整 2021-01-18 13:37:45 +08:00
fan
f60054ccad 现地切行调后 车站显示问题调整 2021-01-18 11:29:03 +08:00
fan
4dc2382075 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 10:52:19 +08:00
fan
fa412d1079 南京二号线 状态调整 2021-01-18 10:52:06 +08:00
lVAL
20880fe1fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
2021-01-15 18:53:43 +08:00
lVAL
63881d156c 修改指令配置 2021-01-15 18:52:28 +08:00
fan
e7f2d73857 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:42:43 +08:00
fan
649691b1c3 操作表盘调整 2021-01-15 18:42:17 +08:00
joylink_cuiweidong
3e1696d081 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:36:52 +08:00
joylink_cuiweidong
69737a06f0 区段 颜色配置文件调整 2021-01-15 18:36:13 +08:00
sunzhenyu
1412834ce5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:21:42 +08:00
sunzhenyu
a63060ac2f 修改测试中三维沙盘数据ui 2021-01-15 18:21:36 +08:00
lVAL
a70de561ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:10:23 +08:00
lVAL
fd5d8245c7 修改代码 2021-01-15 18:10:14 +08:00
fan
1c9c8aab8a 南京二号线 道岔 侧防 和进路锁闭 优先级调整 2021-01-15 18:00:32 +08:00
fan
bacdca5e19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:53:05 +08:00
fan
844b2ee382 南京二号线引导进路 2021-01-15 17:52:54 +08:00
lVAL
dd7f4d2aeb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:23:37 +08:00
lVAL
0ee148437b 增加应答器 创建时必须选择信号机以及校验 2021-01-15 17:23:27 +08:00
joylink_cuiweidong
0eb7ca8a06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:17:33 +08:00
joylink_cuiweidong
f61df9b1e8 岔心状态 绘图代码调整 2021-01-15 17:17:17 +08:00
fan
087f1123b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:00:10 +08:00
fan
45869c5362 信号机状态调整 2021-01-15 16:59:58 +08:00
joylink_cuiweidong
39da2a712d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:44:55 +08:00
joylink_cuiweidong
9aef723b3f bug修改:
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能:
增加线路配置:信号封锁下进路是否可以办理
2021-01-15 16:44:22 +08:00
lVAL
89dacd7deb 增加南京2号线 信号机配置 2021-01-15 16:40:23 +08:00
lVAL
5b4e15a979 修改操作提示 2021-01-15 16:12:49 +08:00