lVAL
|
87f2d274d1
|
修改指令
|
2021-01-20 17:52:34 +08:00 |
|
joylink_cuiweidong
|
913a9229d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:47:22 +08:00 |
|
joylink_cuiweidong
|
cc462621f5
|
佛山线 实训 代码调整
|
2021-01-20 17:47:05 +08:00 |
|
lVAL
|
338a7c9cbe
|
增加信号机封锁解封 实训
|
2021-01-20 17:42:42 +08:00 |
|
lVAL
|
8d25d8c1d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:33:31 +08:00 |
|
lVAL
|
711f0bc70a
|
修改 成都3 实训配置情况
|
2021-01-20 16:33:19 +08:00 |
|
fan
|
287e6251b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:26:42 +08:00 |
|
fan
|
5a36ce69fe
|
添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute
|
2021-01-20 16:26:32 +08:00 |
|
lVAL
|
a4a7494975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:10:25 +08:00 |
|
lVAL
|
78822e9c30
|
成都3 实训引导总锁配置，先注释掉
|
2021-01-20 16:10:14 +08:00 |
|
fan
|
2e4cdc698e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:07:37 +08:00 |
|
fan
|
70045c8f87
|
现地行调条件显示调整
|
2021-01-20 16:07:10 +08:00 |
|
lVAL
|
5764a103c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:51 +08:00 |
|
lVAL
|
c8e2b30271
|
增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训
|
2021-01-20 15:53:36 +08:00 |
|
fan
|
25b6ad4ca8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:23 +08:00 |
|
fan
|
34aca8de12
|
现地行调条件显示调整
|
2021-01-20 15:53:13 +08:00 |
|
joylink_cuiweidong
|
c8c4264be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:32:08 +08:00 |
|
fan
|
a7d4e0c195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 13:50:57 +08:00 |
|
fan
|
330f58eba4
|
右键选择 进路快捷操作盘
|
2021-01-20 13:50:37 +08:00 |
|
joylink_cuiweidong
|
79f0de576c
|
代码调整
|
2021-01-20 11:16:09 +08:00 |
|
joylink_cuiweidong
|
5cbfa16d6c
|
bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改
|
2021-01-20 10:16:15 +08:00 |
|
joylink_cuiweidong
|
3c76a3139c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 09:54:26 +08:00 |
|
joylink_cuiweidong
|
5b5d635f07
|
bug103 设置停站时间范围改为15-300S 修改
|
2021-01-20 09:54:01 +08:00 |
|
fan
|
92929a02fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 19:03:53 +08:00 |
|
fan
|
0126066322
|
调整传输信号机选择
|
2021-01-19 19:03:42 +08:00 |
|
lVAL
|
332aa9b61a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 18:22:14 +08:00 |
|
lVAL
|
35a98a6e00
|
修改 nameAlone 报错的优化
|
2021-01-19 18:22:04 +08:00 |
|
joylink_cuiweidong
|
10ed69f5ec
|
代码调整
|
2021-01-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
745dbd6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 17:15:07 +08:00 |
|
joylink_cuiweidong
|
df6ede1e4b
|
南京二号线 站台操作调整
|
2021-01-19 17:14:47 +08:00 |
|
fan
|
b4059db243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:08:04 +08:00 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
joylink_cuiweidong
|
9828c65b26
|
代码调整
|
2021-01-19 14:07:57 +08:00 |
|
joylink_cuiweidong
|
be344cf815
|
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-19 14:00:32 +08:00 |
|
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
|
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
|
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 |
|
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 |
|
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
|
fa412d1079
|
南京二号线 状态调整
|
2021-01-18 10:52:06 +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 |
|
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 |
|
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 |
|
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
|
cd5bcfe888
|
信号机&道岔状态调整
|
2021-01-15 15:24:19 +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 |
|
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
|
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
|
cb364658fc
|
修改替换错误
|
2021-01-15 09:39:27 +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 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
c4f6cde2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 16:04:03 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
lVAL
|
2fc70489eb
|
修改南京2号线菜单皮肤
|
2021-01-14 15:44:56 +08:00 |
|
lVAL
|
51096d5ea1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 15:32:33 +08:00 |
|
lVAL
|
eb7fa1f5cb
|
修改实现南京2行调和现地界面操作
|
2021-01-14 15:32:17 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
lVAL
|
44adeaf24a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:15:18 +08:00 |
|
lVAL
|
22403b198d
|
修改南京2号线菜单，以及样式
|
2021-01-14 14:15:02 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
fd3f82e7ba
|
修改炼精二号线 逻辑区段名称大小
|
2021-01-13 14:18:48 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
joylink_cuiweidong
|
fbb8157ff1
|
代码调整
|
2021-01-12 20:20:56 +08:00 |
|
joylink_cuiweidong
|
12acee5bc7
|
代码调整
|
2021-01-12 18:06:52 +08:00 |
|
joylink_cuiweidong
|
b33e4b92ed
|
暂时 注释 西安二号线 未实现的 功能
|
2021-01-12 17:57:44 +08:00 |
|
joylink_cuiweidong
|
1e2e8c2609
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/shape/Responder/index.js
|
2021-01-12 17:27:25 +08:00 |
|
joylink_cuiweidong
|
85a88a9431
|
岔心 绘图代码调整
|
2021-01-12 17:25:32 +08:00 |
|
lVAL
|
64df012fc3
|
设置应答器 绘图显示 仿真不显示
|
2021-01-12 11:32:39 +08:00 |
|
lVAL
|
8c261bb3a6
|
优化应答器 状态处理功能
|
2021-01-12 11:00:16 +08:00 |
|
lVAL
|
7bacd3c49f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 10:07:50 +08:00 |
|
lVAL
|
9bd12bb82e
|
增加应答器配置
|
2021-01-12 10:07:31 +08:00 |
|
fan
|
9a74d3ee39
|
成绩导出调整
|
2021-01-11 17:51:54 +08:00 |
|
fan
|
84354dde17
|
课程迁移问题调整&区段限速取消限速仅逻辑区段显示
|
2021-01-11 15:23:56 +08:00 |
|
fan
|
ec5b0e0a1e
|
西门子列车未实现操作注释
|
2021-01-11 11:04:14 +08:00 |
|
fan
|
682a47f730
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 17:27:36 +08:00 |
|
fan
|
0051560fff
|
课程迁移调整
|
2021-01-08 17:27:25 +08:00 |
|
zyy
|
bb22ed66ed
|
调整大屏预览显示流程
|
2021-01-08 16:50:50 +08:00 |
|
joylink_cuiweidong
|
18ff2dcd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 09:54:21 +08:00 |
|
joylink_cuiweidong
|
8145673f5d
|
成都三号线 代码调整
|
2021-01-08 09:54:04 +08:00 |
|