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
|
5173c4e8d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 17:11:46 +08:00 |
|
fan
|
5e2beb6d05
|
代码调整
|
2020-03-19 17:11:35 +08:00 |
|
joylink_cuiweidong
|
753534c42a
|
北京一号线区段操作代码封装
|
2020-03-19 17:04:53 +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 |
|
joylink_cuiweidong
|
d2bc0f0ac1
|
顶部菜单显示调整
|
2020-03-19 15:49:28 +08:00 |
|
zyy
|
1df8f5cac4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 14:43:39 +08:00 |
|
zyy
|
056076c682
|
调整宁波线 引导办理 引导取消
|
2020-03-19 14:43:27 +08:00 |
|
joylink_cuiweidong
|
79813f7641
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 14:34:11 +08:00 |
|
joylink_cuiweidong
|
99893786a4
|
设计平台普通用户iscs不可见
|
2020-03-19 14:33:54 +08:00 |
|
zyy
|
1a20248a0d
|
调整区段逻辑
|
2020-03-19 14:09:50 +08:00 |
|
zyy
|
e4c2cf03b1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 14:04:11 +08:00 |
|
zyy
|
1d46deb12a
|
调整区段绘画逻辑
|
2020-03-19 14:03:54 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
fan
|
16caa26336
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:56:02 +08:00 |
|
fan
|
46520ac118
|
代码调整
|
2020-03-19 10:55:43 +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 |
|
joylink_cuiweidong
|
e1b411965b
|
北京一号线操作代码调整
|
2020-03-19 10:49:21 +08:00 |
|
fan
|
ad858543d8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:23:43 +08:00 |
|
fan
|
acc05f770e
|
调整进路状态影响自动进路功能按钮
|
2020-03-19 10:23:24 +08:00 |
|
joylink_cuiweidong
|
85e587f844
|
北京一号线操作代码调整
|
2020-03-19 10:02:25 +08:00 |
|
fan
|
8ba124ab6f
|
参数调整
|
2020-03-19 09:25:51 +08:00 |
|
fan
|
aa7b0071ca
|
现地操作调整
|
2020-03-19 09:12:46 +08:00 |
|
zyy
|
4243d62ab1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:08:12 +08:00 |
|
zyy
|
2ffdf1de32
|
调整代码
|
2020-03-18 19:07:58 +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 |
|
zyy
|
4537080346
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 18:47:48 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
joylink_cuiweidong
|
7c02daebeb
|
代码调整
|
2020-03-18 18:45:27 +08:00 |
|
joylink_cuiweidong
|
d0107db4f1
|
北京一号线 现地操作总取消操作代码调整
|
2020-03-18 17:18:43 +08:00 |
|
joylink_cuiweidong
|
07af51b757
|
对返回的信号机接近区段数据处理
|
2020-03-18 17:02:07 +08:00 |
|
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 |
|