joylink_cuiweidong
|
70556faea6
|
北交大 客流系统 代码调整
|
2021-02-05 17:29:25 +08:00 |
|
joylink_cuiweidong
|
7a949cd5e2
|
北交大 客流系统 大客流策略 代码调整
|
2021-02-05 17:23:09 +08:00 |
|
joylink_cuiweidong
|
f94f3deadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 17:06:18 +08:00 |
|
joylink_cuiweidong
|
a429f53015
|
北交大 客流系统 大客流策略 页面代码调整
|
2021-02-05 17:05:42 +08:00 |
|
fan
|
b6550e6500
|
国赛取消注释 取消临时限速函数
|
2021-02-05 16:30:11 +08:00 |
|
fan
|
1cea217aa9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 15:17:41 +08:00 |
|
fan
|
f3ec3a1476
|
南京二号线折行显示调整
|
2021-02-05 15:12:57 +08:00 |
|
joylink_cuiweidong
|
62bf080515
|
成都三号线 引导总锁 实训代码调整
|
2021-02-05 14:55:55 +08:00 |
|
joylink_cuiweidong
|
871a04e441
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 11:01:41 +08:00 |
|
joylink_cuiweidong
|
9cdecca6bd
|
成都三号线 添加设置联锁控操作
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
|
2021-02-05 11:01:21 +08:00 |
|
fan
|
88683b3763
|
代码调整
|
2021-02-05 09:19:18 +08:00 |
|
fan
|
766059611c
|
国赛=》取消临时限速 取消注释
(cherry picked from commit 18b5688cdf)
|
2021-02-05 09:18:15 +08:00 |
|
joylink_cuiweidong
|
3233ce39f0
|
北交大 客流代码调整
|
2021-02-04 18:34:31 +08:00 |
|
joylink_cuiweidong
|
e0f2d0a288
|
北交大 客流 代码调整
|
2021-02-04 18:30:02 +08:00 |
|
joylink_cuiweidong
|
68d2ecd6db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 17:18:25 +08:00 |
|
joylink_cuiweidong
|
61fb768bdc
|
北交大客流项目 大客流策略
|
2021-02-04 17:17:45 +08:00 |
|
lVAL
|
d0ce0a9132
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:30:03 +08:00 |
|
lVAL
|
c70a383e91
|
线路：宁波3
问题：增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
|
2021-02-04 13:29:47 +08:00 |
|
sunzhenyu
|
f3e95ffccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:28:00 +08:00 |
|
sunzhenyu
|
a96b8be0fa
|
修改三维客流列车车站订阅消息处理
|
2021-02-04 13:27:53 +08:00 |
|
fan
|
3bfa419bbe
|
宁波一 上电解锁调整
|
2021-02-04 13:23:42 +08:00 |
|
fan
|
3b87f7ef14
|
注释：执行关键操作测试
|
2021-02-04 13:10:24 +08:00 |
|
fan
|
e8de151360
|
宁波一操作实训策略调整&线路配置参数
|
2021-02-04 13:08:59 +08:00 |
|
sunzhenyu
|
8cb4ef4bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 11:03:57 +08:00 |
|
sunzhenyu
|
67d8c9467c
|
修改三维客流订阅连接，增加三维车站管理界面
|
2021-02-04 11:03:48 +08:00 |
|
lVAL
|
bb1c8eca45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 17:07:23 +08:00 |
|
lVAL
|
ff7e32ec0d
|
线路：宁波1，成都3
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
|
2021-02-03 17:07:05 +08:00 |
|
joylink_cuiweidong
|
2de373dd24
|
北交大 客流系统 退出系统 关闭其他窗口
|
2021-02-03 15:44:18 +08:00 |
|
joylink_cuiweidong
|
3a91ccfa0a
|
北交大 客流策略 代码调整
|
2021-02-03 14:08:58 +08:00 |
|
joylink_cuiweidong
|
acbbf14d1c
|
北交大 代码调整
|
2021-02-03 13:45:11 +08:00 |
|
joylink_cuiweidong
|
dd6f3cf7d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 13:40:40 +08:00 |
|
joylink_cuiweidong
|
2968b1ddfb
|
北交大客流策略 添加
|
2021-02-03 13:40:11 +08:00 |
|
lVAL
|
7a10d0497a
|
线路：佛山，宁波3
问题：控制模式实训配置
|
2021-02-03 13:27:11 +08:00 |
|
lVAL
|
579858d02a
|
线路：南京2
问题：配置插芯的实训区段限制
|
2021-02-03 09:46:17 +08:00 |
|
lVAL
|
b7b90fe707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 19:00:15 +08:00 |
|
fan
|
3e50519732
|
宁波一实训折返策略调整
|
2021-02-02 19:00:48 +08:00 |
|
lVAL
|
6dd4e305b3
|
修改实训配置
|
2021-02-02 19:00:03 +08:00 |
|
fan
|
f5e0539e6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 18:55:42 +08:00 |
|
fan
|
83a1eecb40
|
宁波一实训折返策略调整
|
2021-02-02 18:55:33 +08:00 |
|
joylink_cuiweidong
|
eeb7e3afad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
|
2021-02-02 18:16:51 +08:00 |
|
joylink_cuiweidong
|
c149f33a99
|
删除无用的代码
|
2021-02-02 18:06:02 +08:00 |
|
fan
|
18dcc3b089
|
BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控
|
2021-02-02 17:54:40 +08:00 |
|
fan
|
1729082bac
|
折返策略 宁波一实训
|
2021-02-02 17:28:56 +08:00 |
|
fan
|
8aaaf9f9df
|
国赛提交试卷后初始化结果
|
2021-02-02 17:23:29 +08:00 |
|
fan
|
ec32fb62ff
|
折返策略 宁波一实训
|
2021-02-02 17:13:05 +08:00 |
|
fan
|
264770d316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 17:03:53 +08:00 |
|
fan
|
c7e0bdc1e7
|
国赛理论测试显示结果调整
|
2021-02-02 17:03:39 +08:00 |
|
lVAL
|
a6070c49f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
|
2021-02-02 16:45:24 +08:00 |
|
lVAL
|
7d9803165c
|
修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题
|
2021-02-02 16:40:58 +08:00 |
|
fan
|
e7b47de9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 16:35:06 +08:00 |
|