fan
|
2fd6a971f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:25:00 +08:00 |
|
fan
|
cec41aeccf
|
注释南京二行调
|
2021-05-28 18:23:42 +08:00 |
|
zyy
|
58f1e06267
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:12:53 +08:00 |
|
zyy
|
224bbc0177
|
调整进路更新延续保护配置
|
2021-05-28 18:12:35 +08:00 |
|
sunzhenyu
|
397c80a967
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:09:16 +08:00 |
|
sunzhenyu
|
9ea7abf401
|
修改三维大铁驾驶模块接通车速变化
|
2021-05-28 18:09:10 +08:00 |
|
zyy
|
5678498fa6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 17:20:33 +08:00 |
|
zyy
|
d86566be12
|
调整延续保护字段
|
2021-05-28 17:20:16 +08:00 |
|
fan
|
d11b0c6d47
|
增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭
|
2021-05-28 17:18:51 +08:00 |
|
fan
|
ee6dfa9df2
|
南京二列监
|
2021-05-28 15:22:23 +08:00 |
|
fan
|
15e1868d6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 14:08:24 +08:00 |
|
fan
|
e09d5f4aff
|
调整仿真开始显示暂停中 & 南京二列监
|
2021-05-28 14:07:28 +08:00 |
|
zyy
|
e6f3afd6a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 13:08:17 +08:00 |
|
zyy
|
f9835862ce
|
调整侧防流程
|
2021-05-28 13:08:02 +08:00 |
|
fan
|
70ca57d26c
|
时刻表列车总览详览迁移
|
2021-05-28 11:00:26 +08:00 |
|
fan
|
af8a7758c2
|
Merge remote-tracking branch 'origin/test-nan02' into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-05-28 10:18:57 +08:00 |
|
fan
|
1b5da46e80
|
背投轨道总览详览调整
|
2021-05-28 10:10:54 +08:00 |
|
sunzhenyu
|
c2bda14c4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 18:16:01 +08:00 |
|
sunzhenyu
|
d71c4d7d6d
|
增加大铁三维驾驶模块
|
2021-05-27 18:15:54 +08:00 |
|
joylink_cuiweidong
|
bb73608a1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 17:28:36 +08:00 |
|
joylink_cuiweidong
|
8c232d2b13
|
大铁项目 代码调整
|
2021-05-27 17:27:50 +08:00 |
|
zyy
|
a46a2764a5
|
增加用户查询id列表
|
2021-05-27 17:19:05 +08:00 |
|
zyy
|
b2806165ef
|
调整信号机接近区段更新流程
|
2021-05-27 16:40:28 +08:00 |
|
zyy
|
672c95c6c6
|
调整信号接近区段
|
2021-05-27 16:10:58 +08:00 |
|
zyy
|
529839b3ac
|
调整进路更新，延续保护更新
|
2021-05-27 15:15:58 +08:00 |
|
zyy
|
3a06aae186
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 14:19:43 +08:00 |
|
zyy
|
e150fda807
|
调整延续保护
|
2021-05-27 14:19:28 +08:00 |
|
joylink_cuiweidong
|
aa9c961cb0
|
旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state）
|
2021-05-27 13:56:17 +08:00 |
|
joylink_cuiweidong
|
796983e9e8
|
合并 设计平台菜单（pdf上传和编辑器）
|
2021-05-27 13:28:35 +08:00 |
|
joylink_cuiweidong
|
2938528c2e
|
sock 断线重连 代码调整
|
2021-05-27 11:30:03 +08:00 |
|
joylink_cuiweidong
|
411099fdc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 09:33:48 +08:00 |
|
joylink_cuiweidong
|
1c2f663d9c
|
西安三号线 行调添加设置/取消自动触发、自动进路
|
2021-05-27 09:33:15 +08:00 |
|
fan
|
4191df5fff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 17:25:26 +08:00 |
|
fan
|
b776b48bf5
|
哈尔滨列监显示条件限制
|
2021-05-26 17:25:16 +08:00 |
|
fan
|
7412e01b32
|
代码暂提
|
2021-05-26 17:18:20 +08:00 |
|
zyy
|
f9e9efc70c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 17:03:54 +08:00 |
|
zyy
|
2b338ba0de
|
调整进路预览
|
2021-05-26 17:03:38 +08:00 |
|
fan
|
ce1b6c5f8a
|
meger
|
2021-05-26 15:48:55 +08:00 |
|
fan
|
46d74d3002
|
代码暂提
|
2021-05-26 15:46:29 +08:00 |
|
joylink_cuiweidong
|
04f156cc28
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 15:01:26 +08:00 |
|
joylink_cuiweidong
|
7b3e127898
|
南京二号线 十一站型 时刻表 页面添加
|
2021-05-26 15:01:02 +08:00 |
|
zyy
|
8b2f8c7bc1
|
Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02
|
2021-05-26 14:43:51 +08:00 |
|
zyy
|
2d6f8ad984
|
增加车场弹窗
|
2021-05-26 14:43:34 +08:00 |
|
fan
|
49c1eba347
|
列监代码显示
|
2021-05-26 14:19:40 +08:00 |
|
fan
|
86e2520b05
|
代码暂提
|
2021-05-26 14:04:36 +08:00 |
|
fan
|
455fe9dccd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 10:40:29 +08:00 |
|
fan
|
c4b4955541
|
BUG176、174
|
2021-05-26 10:40:17 +08:00 |
|
joylink_cuiweidong
|
300dd3d6d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 10:16:45 +08:00 |
|
joylink_cuiweidong
|
cc4eaf034c
|
西安三号线 右键的车站切换划分问题（bug281）
|
2021-05-26 10:16:22 +08:00 |
|
|
|
c392f41b28
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-25 18:09:38 +08:00 |
|
