joylink_cuiweidong
|
69e224be35
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 19:03:20 +08:00 |
|
joylink_cuiweidong
|
3c301b93ce
|
剧本编制 添加指令 代码
|
2020-08-07 19:02:59 +08:00 |
|
fan
|
9bb0af959a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 18:28:55 +08:00 |
|
fan
|
a5ee8ebed2
|
问题调整
|
2020-08-07 18:28:40 +08:00 |
|
joylink_cuiweidong
|
fd6360611b
|
福州一号线，西安三号线控制权转移代码调整
|
2020-08-07 18:20:45 +08:00 |
|
joylink_cuiweidong
|
c4c1f79258
|
控制权转移代码调整
|
2020-08-07 17:33:12 +08:00 |
|
joylink_cuiweidong
|
ed6694a080
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 17:13:35 +08:00 |
|
joylink_cuiweidong
|
1895dc42b0
|
西安三号线控制权转移代码调整
|
2020-08-07 17:13:12 +08:00 |
|
sunzhenyu
|
ba6797bbda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 15:19:07 +08:00 |
|
sunzhenyu
|
51c2bb296f
|
修改三维cctv寻路路径地址
|
2020-08-07 15:19:01 +08:00 |
|
joylink_cuiweidong
|
18f2265e36
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 14:12:45 +08:00 |
|
joylink_cuiweidong
|
fda52feb52
|
代码调整
|
2020-08-07 14:12:32 +08:00 |
|
fan
|
521a75df32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 14:09:10 +08:00 |
|
fan
|
115f5a539f
|
有扣车跳停显示状态时调整菜单位置
|
2020-08-07 14:09:00 +08:00 |
|
joylink_cuiweidong
|
9e9e7dbed3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 14:01:05 +08:00 |
|
joylink_cuiweidong
|
cc6bbe8073
|
北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整
|
2020-08-07 14:00:32 +08:00 |
|
fan
|
dcfd07c267
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 13:59:29 +08:00 |
|
fan
|
76512af530
|
运行图预览数据调整
|
2020-08-07 13:59:19 +08:00 |
|
joylink_cuiweidong
|
e2a7f160cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-08-07 13:23:08 +08:00 |
|
joylink_cuiweidong
|
e08dcd9c8d
|
宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
|
2020-08-07 13:17:09 +08:00 |
|
fan
|
be5f817f03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:28:59 +08:00 |
|
fan
|
ea5cb27128
|
运行图预览调整
|
2020-08-07 11:28:50 +08:00 |
|
zyy
|
1f2f7bcf89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:10:04 +08:00 |
|
zyy
|
4a1d3d3863
|
增加车站批量设置，调整车站绘图逻辑
|
2020-08-07 11:09:49 +08:00 |
|
fan
|
cf503299fd
|
保留stations数据不清除
|
2020-08-07 10:29:18 +08:00 |
|
fan
|
d449dece06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 10:15:53 +08:00 |
|
fan
|
8e73c01b3f
|
成都一列车样式调整
|
2020-08-07 10:15:39 +08:00 |
|
zyy
|
bf5aa5e1c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 09:59:29 +08:00 |
|
zyy
|
8c0612fb60
|
增加车站绘图字段
|
2020-08-07 09:59:16 +08:00 |
|
fan
|
2668456ffd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 09:44:12 +08:00 |
|
fan
|
276babf477
|
再次进入综合仿真点击操作无效
|
2020-08-07 09:44:03 +08:00 |
|
joylink_cuiweidong
|
849770ab0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 19:34:46 +08:00 |
|
joylink_cuiweidong
|
abb0143988
|
控制权转移代码调整
|
2020-08-06 19:34:13 +08:00 |
|
fan
|
a3f39b3c2f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 16:55:15 +08:00 |
|
fan
|
9615f33d88
|
伸展样式调整
|
2020-08-06 16:54:53 +08:00 |
|
sunzhenyu
|
a52c804b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 16:00:43 +08:00 |
|
sunzhenyu
|
43bfcc9d6b
|
修复三维通号屏蔽门贴图显示bug
|
2020-08-06 16:00:37 +08:00 |
|
zyy
|
0e9b731e93
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:08:07 +08:00 |
|
zyy
|
cde3b39753
|
调整地图绘制流程，调整信号机
|
2020-08-06 15:07:50 +08:00 |
|
fan
|
492c79ffb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:02:46 +08:00 |
|
fan
|
e3e62f85f9
|
佛山目的地码显示长度调整&联锁配置添加参数generateFls
|
2020-08-06 15:02:22 +08:00 |
|
joylink_cuiweidong
|
c7f6639801
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 13:22:19 +08:00 |
|
joylink_cuiweidong
|
026a8d9a7f
|
仿真左上角菜单样式调整
|
2020-08-06 13:21:55 +08:00 |
|
zyy
|
aa63af422b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/signal/index.vue
|
2020-08-06 11:18:48 +08:00 |
|
zyy
|
7ddbe10832
|
增加信号机批量操作
|
2020-08-06 11:15:46 +08:00 |
|
joylink_cuiweidong
|
1a844d20e7
|
地图绘制信号机添加字段（不生成进路的信号机终端）
|
2020-08-06 10:55:38 +08:00 |
|
sunzhenyu
|
353d5f7e68
|
增加三维沙盘列车开门状态转向属性
|
2020-08-05 17:44:17 +08:00 |
|
sunzhenyu
|
7d024d1fb3
|
重新merge三维沙盘代码
|
2020-08-05 17:14:46 +08:00 |
|
sunzhenyu
|
decc8a2db2
|
merge
|
2020-08-05 17:13:53 +08:00 |
|
sunzhenyu
|
71850afd98
|
修改三维沙盘列车转向赋值错误导致的车厢错位
|
2020-08-05 17:11:02 +08:00 |
|