Commit Graph

3639 Commits

Author SHA1 Message Date
joylink_cuiweidong
68571fff18 北京一号线现地 自动折返设置和取消操作代码添加 2020-03-18 15:31:59 +08:00
joylink_cuiweidong
a126ddad02 北京一号线现地区故解操作代码调整 2020-03-18 14:09:38 +08:00
joylink_cuiweidong
96b5cfa3a9 北京一号线现地引导总锁操作代码修改 2020-03-18 13:34:13 +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
joylink_cuiweidong
0bba854e15 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 10:53:56 +08:00
joylink_cuiweidong
ce02703a5a 自动折返和自动进路按钮绘图代码调整 2020-03-18 10:53:42 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
fan
43ffec406d 综合演练调整 2020-03-18 09:59:54 +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
fan
71d328296f 综合演练调整 2020-03-17 18:44:49 +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
joylink_cuiweidong
03d85d705c 哈尔滨一号线现地界面样式调整 2020-03-17 17:05:43 +08:00
zyy
a89b4d5f1d 调整宁波线路引导信号显示 2020-03-17 16:57:09 +08:00
zyy
a7baf76513 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 16:12:26 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
joylink_cuiweidong
9dc0124da2 哈尔滨线路 现地行调切换代码调整 2020-03-17 14:28:23 +08:00
zyy
d3b9b718b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 11:29:47 +08:00
zyy
96ed68cf65 调整宁波线路现地操作 2020-03-17 11:29:34 +08:00
joylink_cuiweidong
09e452143d 北京一号线 现地 道岔操作代码调整 2020-03-17 11:09:09 +08:00
fan
022cf8c6ac 代码调整 2020-03-17 10:07:02 +08:00
joylink_cuiweidong
81c88dd63c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 09:55:04 +08:00
joylink_cuiweidong
b088287b6c 北京一号线 现地 站台总取消 站台扣车操作代码操作 2020-03-17 09:54:49 +08:00
fan
36026fc4ed 删除日志 2020-03-17 09:29:41 +08:00
fan
1598e77215 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 09:26:02 +08:00
fan
b06b2b58e2 调整现地操作 2020-03-17 09:25:40 +08:00
zyy
154b252fd6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 19:08:31 +08:00
zyy
9e150eed8d 调整控制权转移请求参数,调整宁波区段显示逻辑 2020-03-16 19:08:18 +08:00
joylink_cuiweidong
f437f18f63 北京线现地进路建立代码调整 2020-03-16 18:53:36 +08:00
fan
7fce0afd5a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:57:53 +08:00
joylink_cuiweidong
c695309b9f 代码修改 2020-03-16 17:56:10 +08:00
fan
18f69e3429 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:54:42 +08:00
fan
aa93cfc250 调整现地操作 2020-03-16 17:54:30 +08:00
joylink_cuiweidong
9bac0200be 代码调整 2020-03-16 17:46:34 +08:00
fan
9c3a61a747 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:17:18 +08:00
fan
0377ef014b 合并代码 2020-03-16 17:16:59 +08:00
joylink_cuiweidong
1a8b37f2b4 北京一号线 现地 排列进路操作代码调整 2020-03-16 16:28:53 +08:00
zyy
933f0c1bba 调整综合演练ibp获取数据 2020-03-16 16:06:50 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00
zyy
778a7869af 调整默认状态 2020-03-16 11:04:15 +08:00
zyy
c39ec3301b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 11:02:46 +08:00