fan
|
27b5fcb962
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-16 10:51:15 +08:00 |
|
fan
|
55d88442c3
|
新建列车报错调整
|
2021-07-16 10:50:33 +08:00 |
|
yuan
|
6a674f7db9
|
综合演练 上下行列表显示问题修复
|
2021-07-16 10:30:27 +08:00 |
|
fan
|
79f3df8de6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-15 17:25:31 +08:00 |
|
fan
|
a5ab114e2d
|
调整行调列车显示问题
|
2021-07-15 17:25:20 +08:00 |
|
sunzhenyu
|
d6f5205ae4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-15 10:56:10 +08:00 |
|
sunzhenyu
|
663e874e06
|
修改三维课程编辑器
|
2021-07-15 10:56:04 +08:00 |
|
fan
|
d2357e0797
|
一键生成集中站现地配置
|
2021-07-15 10:50:29 +08:00 |
|
fan
|
3bb9c2a8d4
|
调整集中站设备显示
|
2021-07-14 09:32:12 +08:00 |
|
fan
|
24ec537739
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-12 10:39:01 +08:00 |
|
fan
|
79a85639fc
|
非管理员开放倍速功能（5倍速）
|
2021-07-12 10:38:39 +08:00 |
|
yuan
|
01ed5397ad
|
ibp盘按钮增加亮灯颜色字段
|
2021-07-12 10:37:14 +08:00 |
|
fan
|
efe78c3611
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-09 11:26:18 +08:00 |
|
fan
|
2cdac30d19
|
仿真系统测试反馈表11：列车降级ITC后，鼠标悬停列车信息，依然显示CTC列车
|
2021-07-09 11:26:02 +08:00 |
|
yuan
|
a641b51505
|
xa3-修改列车识别号bugfix
|
2021-07-09 10:30:51 +08:00 |
|
fan
|
acba981209
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-08 15:48:21 +08:00 |
|
fan
|
af3f6fcbc8
|
ＴＳ强转站控密码为１２，仿真系统为１２３４５６
|
2021-07-08 15:48:03 +08:00 |
|
yuan
|
cd3eb07730
|
PSL增加锁紧指示灯
|
2021-07-08 14:08:33 +08:00 |
|
yuan
|
ebbfc85acc
|
IBP盘增加关门按钮
|
2021-07-08 13:43:38 +08:00 |
|
yuan
|
67fe7b6774
|
xa3_头码车识别号校验修改
|
2021-07-08 11:15:04 +08:00 |
|
joylink_cuiweidong
|
42d0fefa71
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-06 09:51:39 +08:00 |
|
joylink_cuiweidong
|
52005bb913
|
删除计划车bug修改（bug335）
|
2021-07-06 09:51:08 +08:00 |
|
fan
|
ab699c2f79
|
添加线路配置 setManualWhenHeadTrainArriveTarget 头码车抵达目的地后变为人工车
|
2021-07-05 16:37:12 +08:00 |
|
fan
|
bdd06c3f1e
|
登录页面添加教师登录
|
2021-07-05 16:16:17 +08:00 |
|
fan
|
41be6dbd8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-05 14:28:33 +08:00 |
|
fan
|
eaa60a811b
|
邮箱=》邮箱（账号）
|
2021-07-05 14:28:18 +08:00 |
|
joylink_cuiweidong
|
d5a232c87a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 16:46:25 +08:00 |
|
joylink_cuiweidong
|
a39996e457
|
福州一号线 运行图 加线抽线
去除 西安三 运行图 加线抽线
|
2021-07-02 16:45:51 +08:00 |
|
fan
|
9d64d05202
|
删除console
|
2021-07-02 14:10:52 +08:00 |
|
fan
|
4f844f3242
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 14:02:27 +08:00 |
|
fan
|
041cabfe00
|
西安延续保护信号机名称显示调整 列车详情调整
|
2021-07-02 14:02:12 +08:00 |
|
joylink_cuiweidong
|
6ddee3ac9d
|
Merge remote-tracking branch 'remotes/origin/test_cx' into test
|
2021-07-02 13:45:32 +08:00 |
|
joylink_cuiweidong
|
7dff579224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-02 13:45:11 +08:00 |
|
joylink_cuiweidong
|
4e2b07829c
|
西安三号线 运行图 加线抽线功能 添加
|
2021-07-02 13:44:21 +08:00 |
|
fan
|
813a0771d9
|
添加线路配置：transferRouteCanOnlyFaultUnlock 转换轨进路只能通过故障解锁来取消
|
2021-07-02 10:02:41 +08:00 |
|
fan
|
d5357d3614
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-01 16:06:41 +08:00 |
|
fan
|
19058b1935
|
列车遮挡调整
|
2021-07-01 16:06:31 +08:00 |
|
yuan
|
fb7dbd65fb
|
列车信息显示修改
|
2021-07-01 11:29:06 +08:00 |
|
joylink_cuiweidong
|
49812887fc
|
Merge branch 'test' into test_cx
# Conflicts:
# src/jmapNew/theme/xian_01/menus/menuBar.vue
|
2021-07-01 10:34:28 +08:00 |
|
yuan
|
29730c2803
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_jhc
|
2021-07-01 10:15:55 +08:00 |
|
joylink_cuiweidong
|
87095b4f4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/store/modules/runplan.js
|
2021-07-01 10:09:23 +08:00 |
|
joylink_cuiweidong
|
c7e75739c3
|
西安三加线逻辑调整
|
2021-07-01 10:06:35 +08:00 |
|
fan
|
8d5664d9da
|
西安地铁页面调整
|
2021-07-01 09:42:36 +08:00 |
|
fan
|
a8f4b06fbf
|
删除runPlan 弃用代码
|
2021-07-01 09:42:13 +08:00 |
|
fan
|
4707434ed4
|
添加线路配置：设置头码车时检查方向checkDirectionWhenSetHead
|
2021-06-30 16:59:17 +08:00 |
|
fan
|
d04e35061c
|
无人自折=》无人折返
|
2021-06-30 16:51:23 +08:00 |
|
fan
|
5954a01554
|
西安三号线添加设头码车车次编号限制
|
2021-06-30 16:33:35 +08:00 |
|
fan
|
ae59cdac36
|
西安三设置头码车时不根据车次号搜索列车信息
|
2021-06-30 16:11:16 +08:00 |
|
fan
|
9a352c50fa
|
调整折返策略回显
|
2021-06-30 15:28:59 +08:00 |
|
fan
|
b5a225905e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-30 14:55:41 +08:00 |
|