joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
8,894 Commits 20 Branches 0 Tags 448 MiB
ea99e7a9e4
Commit Graph

8648 Commits

Author SHA1 Message Date
joylink_cuiweidong
d404ed01dc 代码调整 2021-01-19 13:57:35 +08:00
fan
606c4ae301 menuButton调整 2021-01-19 13:56:45 +08:00
fan
12be0c61cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:26:05 +08:00
fan
daea6e1760 传输信号机选中状态 2021-01-19 13:25:53 +08:00
lVAL
5f80334433 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:04:06 +08:00
lVAL
696af622b7 调整南京2岔芯设置限速和设置封锁 2021-01-19 13:03:43 +08:00
fan
49405666df 传输信号机参数调整 2021-01-19 11:18:24 +08:00
fan
732c44fea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 11:10:04 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
lVAL
7afd9025b5 增加南京2站台取消设置指令 2021-01-19 10:39:01 +08:00
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
lVAL
c06bad3005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:09:35 +08:00
lVAL
cc5ee4661f 修改 发送命令后 提示的信息 2021-01-15 16:09:26 +08:00
fan
a60209a10f 信号机状态调整 2021-01-15 16:01:15 +08:00
lVAL
bc8f65c149 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:25:49 +08:00
lVAL
57acd71924 修改南京2蓝色颜色 2021-01-15 15:25:41 +08:00
fan
e5611cebc8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:24:30 +08:00
fan
cd5bcfe888 信号机&道岔状态调整 2021-01-15 15:24:19 +08:00
lVAL
c63d475d57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:11:24 +08:00
lVAL
3c37037558 增加应答器关联信号机，以及绘图信号机，区段激活选择 2021-01-15 15:11:13 +08:00
joylink_cuiweidong
f21cfd2256 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:35:28 +08:00
fan
93eaaacd96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:34:35 +08:00
fan
0caf3d233a 排列进路 2021-01-15 13:34:25 +08:00
joylink_cuiweidong
0f4f6ef5f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:27:09 +08:00
joylink_cuiweidong
53b51a7b63 道岔 生成逻辑代码调整 2021-01-15 13:26:42 +08:00
lVAL
25e89c9b1c 配置强解 道岔和区段，（道岔等待后端确定指令） 2021-01-15 12:25:25 +08:00
lVAL
2024cef7c9 修改南京仿真bar遮挡运行图的问题 2021-01-15 12:18:27 +08:00
fan
12925e92bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:21:22 +08:00
fan
29c8e5b4b9 暂提 2021-01-15 11:21:11 +08:00
lVAL
80f8ecf19f 修改南京2号线 tempData 报错问题 2021-01-15 11:16:17 +08:00
lVAL
356042f673 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:00:05 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
04e4df6225 代码调整 2021-01-15 10:38:35 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
48955258ea 修改应答器 绘制card css 2021-01-15 09:54:56 +08:00
lVAL
4c89a777ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:53:46 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
fan
0671c6e733 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:42:36 +08:00
fan
15928a6248 道岔封锁状态调整 2021-01-15 09:42:19 +08:00
lVAL
1c06c408ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:39:35 +08:00
lVAL
cb364658fc 修改替换错误 2021-01-15 09:39:27 +08:00
sunzhenyu
5bbe37c30b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:35:57 +08:00
sunzhenyu
b6ab1b3c6a 测试版本三维沙盘增加镜头控制模型大小，信号机朝向，修改单线路 2021-01-15 09:35:49 +08:00
lVAL
41f1253746 修改 南京2号线 中心操作弹窗为非模式对话框 2021-01-15 09:34:16 +08:00
lVAL
284899599c 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-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
c8d0bf50f5 代码调整 2021-01-14 17:11:10 +08:00
joylink_cuiweidong
06edd5f531 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 17:00:04 +08:00
joylink_cuiweidong
3dd6696140 代码调整 2021-01-14 16:59:41 +08:00
fan
359e24dfbd merge 2021-01-14 16:35:45 +08:00