fan
|
06a0eaf285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 10:16:41 +08:00 |
|
fan
|
ed3f1cee82
|
iscs调整&新版考试实训类型匹配
|
2020-05-07 10:16:15 +08:00 |
|
joylink_cuiweidong
|
a2470debf2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:42:44 +08:00 |
|
joylink_cuiweidong
|
ea138e7f3c
|
iscs系统 添加机电下的菜单
|
2020-05-07 09:42:26 +08:00 |
|
zyy
|
4b53a2a1c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:04:41 +08:00 |
|
zyy
|
ca4a4689fc
|
调整大屏偏移
|
2020-05-07 09:04:28 +08:00 |
|
fan
|
30e794ddb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:03:27 +08:00 |
|
fan
|
81c6b76485
|
大屏调整
|
2020-05-07 09:03:10 +08:00 |
|
joylink_cuiweidong
|
bc9cd67681
|
代码调整
|
2020-05-06 18:29:08 +08:00 |
|
fan
|
faa2b72003
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 17:18:16 +08:00 |
|
fan
|
997b962851
|
大屏禁用拖拽
|
2020-05-06 17:18:06 +08:00 |
|
fan
|
15d88d2f7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 16:57:18 +08:00 |
|
fan
|
22fffd340f
|
大屏测试
|
2020-05-06 16:57:07 +08:00 |
|
joylink_cuiweidong
|
de1a37f199
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 16:56:56 +08:00 |
|
joylink_cuiweidong
|
4a32fddddb
|
绘图 交路代码调整
iscs 系统代码调整
考试保存规则代码调整
|
2020-05-06 16:56:30 +08:00 |
|
zyy
|
515880d1c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 13:11:52 +08:00 |
|
zyy
|
adf2627fec
|
调整西安二号线鼠标移入
|
2020-05-06 13:11:37 +08:00 |
|
joylink_cuiweidong
|
b15bae51cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:48:27 +08:00 |
|
joylink_cuiweidong
|
fbd0baba41
|
代码调整
|
2020-04-30 18:48:07 +08:00 |
|
fan
|
ddd707c38a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:25:32 +08:00 |
|
fan
|
6eb648199e
|
西安二信号机操作问题修改
|
2020-04-30 18:25:21 +08:00 |
|
sunzhenyu
|
3f429baad2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:19:44 +08:00 |
|
sunzhenyu
|
3d6612cfbd
|
升级三维继电器动画模块
|
2020-04-30 18:19:32 +08:00 |
|
joylink_cuiweidong
|
c89c18fb21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 18:06:16 +08:00 |
|
joylink_cuiweidong
|
101e58118a
|
新版地图 绘图 交路代码调整
|
2020-04-30 18:04:59 +08:00 |
|
fan
|
b6105f015d
|
绘图高亮显影调整
|
2020-04-30 17:52:37 +08:00 |
|
fan
|
4b50306981
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 17:40:44 +08:00 |
|
fan
|
276620a25e
|
西安二信号机调整
|
2020-04-30 17:40:25 +08:00 |
|
joylink_cuiweidong
|
7460abd1f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 17:30:56 +08:00 |
|
joylink_cuiweidong
|
d189513501
|
新版绘图 交路代码调整
|
2020-04-30 17:30:10 +08:00 |
|
zyy
|
94ca9bce69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 17:22:25 +08:00 |
|
zyy
|
327eb81aa7
|
调整绘图更新坐标
|
2020-04-30 17:22:10 +08:00 |
|
joylink_cuiweidong
|
268d3f939e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 16:34:08 +08:00 |
|
joylink_cuiweidong
|
81f05de40c
|
添加 根据地图交路一键生成生成所有站间运行等级 接口
修改 根据地图交路区段生成站间运行等级 接口
|
2020-04-30 16:33:26 +08:00 |
|
fan
|
f650e6f29e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 16:19:46 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
joylink_cuiweidong
|
48a671c5e2
|
新版地图绘图 交路 区段高亮
|
2020-04-30 15:48:08 +08:00 |
|
joylink_cuiweidong
|
395d15d959
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 15:16:38 +08:00 |
|
joylink_cuiweidong
|
2f8832be83
|
新版绘图 交路代码调整
|
2020-04-30 15:16:20 +08:00 |
|
fan
|
26487c0dd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:50:42 +08:00 |
|
fan
|
744ea986c0
|
绘图调整
|
2020-04-30 14:50:27 +08:00 |
|
joylink_cuiweidong
|
3f942518f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:39:56 +08:00 |
|
joylink_cuiweidong
|
91b377f975
|
交路 列表拖拽问题调整
|
2020-04-30 14:38:46 +08:00 |
|
fan
|
c101ee8f92
|
绘图tab-pane延时渲染
|
2020-04-30 13:40:32 +08:00 |
|
fan
|
4797aa046f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 13:19:46 +08:00 |
|
fan
|
e348262118
|
西安二号线信号机操作调整
|
2020-04-30 13:19:33 +08:00 |
|
zyy
|
ba2aff1532
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 11:29:16 +08:00 |
|
zyy
|
eb6cd7ce2d
|
调整道岔使能发送流程，及绘图
|
2020-04-30 11:28:56 +08:00 |
|
fan
|
545b481532
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:54:20 +08:00 |
|
fan
|
5682ab67b0
|
信号机批量设置联锁站&区段添加所属车站属性
|
2020-04-30 10:54:06 +08:00 |
|