Commit Graph

243 Commits

Author SHA1 Message Date
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
joylink_cuiweidong
089b8960b9 佛山线路现地界面调整 2020-03-24 18:01:10 +08:00
fan
70b75e354c 状态灯调整 2020-03-24 16:50:09 +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
a22ec53e39 调整佛山线路信号机,站台状态 2020-03-24 15:09:25 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
zyy
bd48b2844c 佛山线路道岔状态调整,修改道岔绘图元素逻辑 2020-03-24 13:39:20 +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
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +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
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
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
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
zyy
402d161e73 调整格式 2020-03-20 13:07:31 +08:00
zyy
2f654975d5 调整哈尔滨信号机状态 2020-03-19 18:39:20 +08:00
zyy
67f0712eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:19:01 +08:00
zyy
f78d9e80fe 调整哈尔滨道岔现地操作 2020-03-19 17:18:46 +08:00
fan
7de2c38af4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 16:17:53 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
zyy
056076c682 调整宁波线 引导办理 引导取消 2020-03-19 14:43:27 +08:00
zyy
1a20248a0d 调整区段逻辑 2020-03-19 14:09:50 +08:00
zyy
1d46deb12a 调整区段绘画逻辑 2020-03-19 14:03:54 +08:00
zyy
6570028b95 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 10:52:54 +08:00
zyy
6e3dcf6b65 调整哈尔滨线路 区段,信号机操作 处理信号机点击高亮 2020-03-19 10:52:42 +08:00
fan
acc05f770e 调整进路状态影响自动进路功能按钮 2020-03-19 10:23:24 +08:00
fan
aa7b0071ca 现地操作调整 2020-03-19 09:12:46 +08:00
fan
838f2311f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:05:12 +08:00
fan
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
joylink_cuiweidong
68571fff18 北京一号线现地 自动折返设置和取消操作代码添加 2020-03-18 15:31:59 +08:00
zyy
a925c568e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 11:19:10 +08:00
zyy
4203c30e30 调整宁波线路自动折返 计轴复位操作 2020-03-18 11:18:52 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
joylink_cuiweidong
c01b261638 引导总锁绘制代码调整 2020-03-17 18:25:03 +08:00
zyy
2fb74f520d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 18:02:16 +08:00
zyy
e2930da073 调整信号机状态 2020-03-17 18:02:02 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00
zyy
a89b4d5f1d 调整宁波线路引导信号显示 2020-03-17 16:57:09 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00