Commit Graph

606 Commits

Author SHA1 Message Date
joylink_cuiweidong
ef33f0f628 宁波一号线 增加列车移入显示边框 2020-03-25 17:15:16 +08:00
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
joylink_cuiweidong
d3b4c090a9 佛山有轨电车 现地操作调整 2020-03-25 13:20:31 +08:00
joylink_cuiweidong
7604e276e1 宁波一号线 列车样式调整 2020-03-25 10:43:32 +08:00
joylink_cuiweidong
c31c09e88b 佛山有轨电车 现地操作调整 2020-03-24 18:18:01 +08:00
joylink_cuiweidong
089b8960b9 佛山线路现地界面调整 2020-03-24 18:01:10 +08:00
fan
a0b9974040 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:51:16 +08:00
fan
70b75e354c 状态灯调整 2020-03-24 16:50:09 +08:00
joylink_cuiweidong
fabd5f1025 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:40:37 +08:00
joylink_cuiweidong
f83753102e 北京线宁波线操作代码调整 2020-03-24 16:40:17 +08:00
fan
652aa43a2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:37:26 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
zyy
98158fdb86 删除默认状态 2020-03-24 15:10:31 +08:00
zyy
92adfa396a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 15:09:42 +08:00
zyy
a22ec53e39 调整佛山线路信号机,站台状态 2020-03-24 15:09:25 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
joylink_cuiweidong
be03a9e623 宁波线操作代码调整 2020-03-24 14:43:58 +08:00
joylink_cuiweidong
21ac6c0ac4 北京一号线宁波一号线控制权转换代码调整 2020-03-24 13:43:30 +08:00
zyy
6abb83f838 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 13:39:35 +08:00
zyy
bd48b2844c 佛山线路道岔状态调整,修改道岔绘图元素逻辑 2020-03-24 13:39:20 +08:00
joylink_cuiweidong
22330bf756 宁波一号线自动折返操作代码调整 2020-03-24 11:09:10 +08:00
joylink_cuiweidong
4e38516efb 宁波一号线操作代码调整 2020-03-24 10:12:21 +08:00
joylink_cuiweidong
91e2c81c6f 佛山有轨电车 操作代码调整 2020-03-23 18:12:37 +08:00
joylink_cuiweidong
93fd139b6e 佛山有轨电车 信号机站台操作代码调整 2020-03-23 17:43:37 +08:00
joylink_cuiweidong
3d6f5a2537 佛山有轨电车 区段道岔操作代码调整 2020-03-23 17:25:18 +08:00
fan
d82a2cf297 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 16:01:45 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
joylink_cuiweidong
0412a6b1a3 宁波一号线 站台信号机区段操作代码调整 2020-03-23 14:48:26 +08:00
zyy
a6543ca2b4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 14:28:11 +08:00
zyy
688aa7310b 增加佛山有轨线路文件,调整区段显示状态 2020-03-23 14:27:57 +08:00
fan
f574279afe Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:59:51 +08:00
zyy
72d27264f4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:48:56 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
joylink_cuiweidong
fd302bbbdd 北京一号线控制权操作代码调整 2020-03-23 11:09:40 +08:00
fan
0e23e9f6a9 调整代码 2020-03-23 10:47:16 +08:00
joylink_cuiweidong
dd9080c0d0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 18:51:40 +08:00
joylink_cuiweidong
c3e48fe107 北京一号线控制权转换代码调整 2020-03-20 18:51:26 +08:00
zyy
9280651ed4 删除信号机多余元素 2020-03-20 18:14:42 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +08:00
zyy
21c453f68d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 17:17:32 +08:00
zyy
7a15c07782 调整哈尔滨信号机状态 2020-03-20 17:17:23 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
fan
471fac0499 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 15:01:22 +08:00
fan
457b78bd7e 操作调整 2020-03-20 15:00:31 +08:00
joylink_cuiweidong
2c4848f4db 北京一号线指令操作调整 2020-03-20 14:48:22 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
joylink_cuiweidong
d50f096b0a 北京一号线站台操作代码调整 2020-03-20 13:30:57 +08:00
zyy
402d161e73 调整格式 2020-03-20 13:07:31 +08:00
joylink_cuiweidong
61d54b2209 北京一号线道岔操作代码调整 2020-03-20 11:23:46 +08:00