joylink_cuiweidong
|
d541259695
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-10 17:11:49 +08:00 |
|
joylink_cuiweidong
|
7d21d75ad0
|
修改 道岔位置定位、反位 为pos字段
修改 信号机红绿黄显示的三个字段 为aspect
|
2021-09-10 17:11:48 +08:00 |
|
fan
|
b9e814b53f
|
ISCS状态显示调整
|
2021-09-10 09:49:54 +08:00 |
|
fan
|
9bad0d61a7
|
Revert "显示配置调整"
This reverts commit 5e5474ae
|
2021-09-08 14:40:35 +08:00 |
|
yuan
|
9f80982d14
|
去掉console.log()
|
2021-09-07 17:10:53 +08:00 |
|
yuan
|
e350ae04dc
|
车辆段道岔操作
|
2021-09-07 17:02:27 +08:00 |
|
yuan
|
1efcb7491f
|
倒计时
|
2021-09-07 16:31:45 +08:00 |
|
yuan
|
1c7c43e28d
|
倒计时
|
2021-09-07 15:37:05 +08:00 |
|
yuan
|
733f198b27
|
conflict resolve
|
2021-09-07 15:33:51 +08:00 |
|
yuan
|
6e6f54a0dc
|
conflict resolve
|
2021-09-07 15:32:44 +08:00 |
|
yuan
|
e85986a5f7
|
Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation
|
2021-09-07 15:31:00 +08:00 |
|
yuan
|
976b1d8781
|
福州车辆段倒计时
|
2021-09-07 15:27:58 +08:00 |
|
joylink_cuiweidong
|
35cea8a8f7
|
福州一号线 车辆段仿真 添加 排列进路 取消进路 信号重开指令
|
2021-09-07 15:13:38 +08:00 |
|
yuan
|
939cf77b2e
|
merge
|
2021-09-07 14:35:20 +08:00 |
|
yuan
|
bafc4d65e7
|
Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation
|
2021-09-07 14:01:03 +08:00 |
|
yuan
|
738c96444e
|
福州车辆段
|
2021-09-07 13:54:23 +08:00 |
|
joylink_cuiweidong
|
67bf5babb0
|
福州三号线车辆端 信号机 添加操作指令
|
2021-09-07 13:05:30 +08:00 |
|
joylink_cuiweidong
|
c699a09431
|
代码调整
|
2021-09-06 18:09:55 +08:00 |
|
fan
|
5e5474aee9
|
显示配置调整
|
2021-09-06 17:49:44 +08:00 |
|
joylink_cuiweidong
|
071d88878f
|
福州一号线 车辆段操作 指令调整
|
2021-09-06 17:20:48 +08:00 |
|
joylink_cuiweidong
|
648d04f0b4
|
代码调整
|
2021-09-06 16:55:16 +08:00 |
|
joylink_cuiweidong
|
8fc7907f42
|
代码调整
|
2021-09-06 15:47:15 +08:00 |
|
joylink_cuiweidong
|
429c208f62
|
代码调整
|
2021-09-06 14:42:42 +08:00 |
|
joylink_cuiweidong
|
534fa3d106
|
福州一号线 添加 车辆段 操作按钮
|
2021-09-06 13:57:09 +08:00 |
|
joylink_cuiweidong
|
ed7bc52ced
|
代码调整
|
2021-09-06 11:24:01 +08:00 |
|
joylink_cuiweidong
|
f40fab2d47
|
福州一号线 添加 车辆段 操作按钮文件
|
2021-09-06 11:05:38 +08:00 |
|
fan
|
012f2ee8d9
|
删除操作 设置默认发车轨
|
2021-09-01 10:03:16 +08:00 |
|
fan
|
5e81b002e1
|
西安三添加操作 设置默认发车轨 (问题调整)
|
2021-08-31 09:53:58 +08:00 |
|
fan
|
33b2c3cb43
|
西安三添加操作 设置默认发车轨
|
2021-08-31 09:28:34 +08:00 |
|
fan
|
0ce7e458b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-08-30 15:20:32 +08:00 |
|
fan
|
24a887e7e8
|
南京二号线调整=》atr
|
2021-08-30 15:20:15 +08:00 |
|
zyy
|
455e102696
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-08-25 11:09:58 +08:00 |
|
zyy
|
178e2aa4a9
|
调整运行图加载优化
|
2021-08-25 11:09:38 +08:00 |
|
fan
|
d6659506f7
|
西安三号线 通信车占用=》粉光带故障
|
2021-08-24 16:55:24 +08:00 |
|
fan
|
46c62a5182
|
南京二号线 调整
|
2021-08-20 09:43:58 +08:00 |
|
fan
|
51cfa55f08
|
南京二号线道岔区段延时解锁 闪烁不同步调整
|
2021-08-18 16:15:50 +08:00 |
|
fan
|
d5c79b2ae1
|
南京二号线操作调整
|
2021-08-17 16:58:35 +08:00 |
|
fan
|
a4dea11f3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-08-17 14:14:37 +08:00 |
|
fan
|
7a71a573f5
|
南京二号线操作调整
|
2021-08-17 14:14:22 +08:00 |
|
joylink_cuiweidong
|
1ccf237b6d
|
西安一号线 运行图导入 添加trackName字段
|
2021-08-16 14:59:34 +08:00 |
|
fan
|
56fa301651
|
添加故障处理 回库操作
|
2021-08-12 13:38:59 +08:00 |
|
fan
|
951eac98d4
|
南京二 调整 故障模式不弹出 进路操作弹框
|
2021-08-11 14:39:43 +08:00 |
|
fan
|
9e2c7f67a1
|
南京二 调整PSL 出现多个的问题
|
2021-08-11 09:08:29 +08:00 |
|
fan
|
8fb2e6eb66
|
南京二 故障名称调整
|
2021-08-10 15:47:00 +08:00 |
|
fan
|
fdf781951b
|
BUG356 南京11站:无法跨联锁区排列进路
|
2021-08-09 16:42:18 +08:00 |
|
fan
|
0bc72ed589
|
南京二号线 传输信号机控制权判断调整
|
2021-08-09 15:21:15 +08:00 |
|
fan
|
e81585b706
|
南京二号线调整
|
2021-08-09 09:59:41 +08:00 |
|
fan
|
fd7df04cc5
|
站控和强制站控显示调整
|
2021-08-05 18:25:18 +08:00 |
|
fan
|
693a60d72c
|
关联超限区段调整
|
2021-08-05 18:25:01 +08:00 |
|
fan
|
91c31ea155
|
设置联锁自动触发 灰显调整
|
2021-08-05 18:24:47 +08:00 |
|
|
4b5ff657c9
|
Merge branch 'test' into test_conflictRoute
# Conflicts:
# src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
|
2021-08-03 14:33:47 +08:00 |
|
fan
|
3a7c571c6f
|
西安三号线延续保护显示调整
|
2021-08-03 10:37:18 +08:00 |
|
fan
|
23ed027def
|
西安三现地问题: 站控转换和实际不一样
|
2021-07-30 18:07:44 +08:00 |
|
fan
|
50ed4fcae4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-07-29 17:48:40 +08:00 |
|
fan
|
a1d9b80104
|
西安三行调问题 74 对于可选的进路应显示出反位保护或定位保护
|
2021-07-29 17:48:16 +08:00 |
|
joylink_cuiweidong
|
5deb4cc9ab
|
代码调整
|
2021-07-29 14:06:25 +08:00 |
|
joylink_cuiweidong
|
ab96efb1c6
|
地图绘制 现地配置 增加 可切换显示的车站 字段
|
2021-07-29 11:08:36 +08:00 |
|
fan
|
041c94dbb9
|
添加列车故障 突然EB
|
2021-07-26 18:02:57 +08:00 |
|
joylink_cuiweidong
|
6e45e2c168
|
代码调整
|
2021-07-22 14:56:27 +08:00 |
|
joylink_cuiweidong
|
dfab1da1c6
|
冲突检测 代码调整
冲突进路办理确认代码调整
|
2021-07-21 17:53:14 +08:00 |
|
joylink_cuiweidong
|
ae28541ae1
|
西安三 进路交Ats控 冲突检测代码调整
|
2021-07-20 18:06:22 +08:00 |
|
fan
|
38dbebe6a6
|
调整西安三设置联锁自动进路条件
|
2021-07-20 17:58:27 +08:00 |
|
fan
|
2523801dbe
|
删除列车缺少参数调整
|
2021-07-16 14:36:18 +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
|
TS强转站控密码为12,仿真系统为123456
|
2021-07-08 15:48:03 +08:00 |
|
yuan
|
cd3eb07730
|
PSL增加锁紧指示灯
|
2021-07-08 14:08:33 +08:00 |
|
yuan
|
67fe7b6774
|
xa3_头码车识别号校验修改
|
2021-07-08 11:15:04 +08:00 |
|
joylink_cuiweidong
|
52005bb913
|
删除计划车bug修改(bug335)
|
2021-07-06 09:51:08 +08:00 |
|
joylink_cuiweidong
|
a39996e457
|
福州一号线 运行图 加线抽线
去除 西安三 运行图 加线抽线
|
2021-07-02 16:45:51 +08:00 |
|
joylink_cuiweidong
|
4e2b07829c
|
西安三号线 运行图 加线抽线功能 添加
|
2021-07-02 13:44:21 +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
|
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
|
3992310427
|
修改折返默认值
|
2021-06-29 15:07:11 +08:00 |
|
fan
|
6cee614d56
|
更换折返方式枚举
|
2021-06-29 14:03:58 +08:00 |
|
fan
|
faf5383c5f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 13:54:04 +08:00 |
|
fan
|
53041725ac
|
更换折返方式枚举
|
2021-06-29 13:53:39 +08:00 |
|
joylink_cuiweidong
|
835e638a31
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-29 10:33:32 +08:00 |
|
joylink_cuiweidong
|
94102b6c98
|
第三方登陆代码调整
|
2021-06-29 10:33:09 +08:00 |
|
fan
|
cae193b929
|
Bug327 西安三:道岔计轴区段无法设置ARB橙光带故障
|
2021-06-29 10:23:36 +08:00 |
|
fan
|
e0f672cb7d
|
西安三列车故障处理添加连挂操作
|
2021-06-28 15:28:33 +08:00 |
|
fan
|
1c2037f9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-28 14:55:30 +08:00 |
|
fan
|
e6f479379b
|
列车限速区间选择5-65
|
2021-06-28 14:55:18 +08:00 |
|
yuan
|
7514ff3270
|
bugfix-xa3-048 修改列车识别号字段显示错误
|
2021-06-28 10:40:35 +08:00 |
|
yuan
|
0c219aff71
|
抽线
|
2021-06-25 15:34:51 +08:00 |
|
yuan
|
51a0ebd5fe
|
抽线
|
2021-06-25 15:34:35 +08:00 |
|
joylink_cuiweidong
|
a6d01035dd
|
成都三,福州一实训 说明修改
|
2021-06-22 10:14:39 +08:00 |
|
joylink_cuiweidong
|
14da4cbc2b
|
成都三号线 实训说明调整
|
2021-06-21 16:49:13 +08:00 |
|
joylink_cuiweidong
|
22af8c1af7
|
西安二号线 宁波三号线 实训说明修改
|
2021-06-21 14:13:00 +08:00 |
|
joylink_cuiweidong
|
406f23eb7c
|
福州一 宁波一 实训 描述修改
|
2021-06-21 13:24:35 +08:00 |
|
fan
|
1fdde772c1
|
BUG316哈尔滨:右键点击列车车次框,不应弹出列监对话框,只左键点击弹出即可&BUG312哈尔滨:现地无法追踪全开
|
2021-06-16 16:55:38 +08:00 |
|
fan
|
f9ee7ff8e8
|
哈尔滨行调不显示基础按钮
|
2021-06-16 14:50:14 +08:00 |
|
joylink_cuiweidong
|
7ea966b539
|
西安三 行调添加 强制取消扣车
|
2021-06-16 10:30:17 +08:00 |
|
joylink_cuiweidong
|
79fa65c145
|
宁波一号线 实训操作定义中的 实训说明 修改
|
2021-06-11 09:17:38 +08:00 |
|
joylink_cuiweidong
|
c024fd281f
|
更改宁波一号线的 操作定义中的 实训说明
|
2021-06-10 13:42:33 +08:00 |
|