joylink_cuiweidong
|
bcc92b6672
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 16:45:39 +08:00 |
|
joylink_cuiweidong
|
8a4d98612e
|
哈尔滨线路实训代码调整
|
2020-09-01 16:45:23 +08:00 |
|
sunzhenyu
|
55ea7ec549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 15:22:25 +08:00 |
|
sunzhenyu
|
e57a70df9e
|
修改三维vr道岔模型动画导航bug
|
2020-09-01 15:22:19 +08:00 |
|
zyy
|
57cb96eb48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/mapsystemNew/common/index.vue
|
2020-09-01 15:11:59 +08:00 |
|
zyy
|
5590e43bd5
|
调整代码
|
2020-09-01 15:10:35 +08:00 |
|
sunzhenyu
|
b87220ec8c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 13:18:20 +08:00 |
|
sunzhenyu
|
7e7a76ae6a
|
修改三维通号订阅关闭
|
2020-09-01 13:18:12 +08:00 |
|
fan
|
73224c25c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 11:22:08 +08:00 |
|
fan
|
13764f98a7
|
修改会话问题
(cherry picked from commit 716e7c2117)
|
2020-09-01 11:22:01 +08:00 |
|
sunzhenyu
|
5e39f3e2fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 11:17:36 +08:00 |
|
sunzhenyu
|
4a1e3d0aa7
|
修改三维电子沙盘内外侧站台数据不全bug，修改外车站台漫游
|
2020-09-01 11:17:29 +08:00 |
|
fan
|
46e6ec68d5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 18:32:56 +08:00 |
|
fan
|
1164be59a4
|
修改剧本id
|
2020-08-31 18:32:33 +08:00 |
|
joylink_cuiweidong
|
83a2cb21de
|
重置剧本代码调整
|
2020-08-31 16:51:36 +08:00 |
|
joylink_cuiweidong
|
9ef2ac1287
|
剧本代码调整
|
2020-08-31 16:37:45 +08:00 |
|
joylink_cuiweidong
|
c76205790a
|
宁波一号线实训操作代码调整
|
2020-08-31 15:58:55 +08:00 |
|
fan
|
972d5a33bb
|
响应式布局
|
2020-08-31 15:31:15 +08:00 |
|
fan
|
71e4a8862b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 14:15:10 +08:00 |
|
fan
|
d8c4bee674
|
考试加载进度条恢复
|
2020-08-31 14:14:45 +08:00 |
|
joylink_cuiweidong
|
3ff902ee14
|
区段鼠标事件调整
|
2020-08-31 13:41:33 +08:00 |
|
fan
|
246568175f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:28:32 +08:00 |
|
fan
|
c44a081afa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:27:38 +08:00 |
|
fan
|
8c07cf764a
|
代码调整
|
2020-08-31 13:27:27 +08:00 |
|
zyy
|
00ebcd739e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:25:41 +08:00 |
|
zyy
|
41fe728af4
|
调整运行图显示
|
2020-08-31 13:25:26 +08:00 |
|
sunleking
|
9ca8f50dea
|
修改按钮文字描述
|
2020-08-31 11:16:18 +08:00 |
|
zyy
|
d579dc7a73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 10:35:07 +08:00 |
|
zyy
|
8e6280e542
|
调整格式
|
2020-08-31 10:34:51 +08:00 |
|
joylink_cuiweidong
|
2637b952f3
|
代码调整
|
2020-08-31 10:31:36 +08:00 |
|
joylink_cuiweidong
|
b98039d5fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 10:13:39 +08:00 |
|
joylink_cuiweidong
|
8027bc90ae
|
宁波福州佛山默认不显示道岔区段的名称调整
|
2020-08-31 10:13:26 +08:00 |
|
zyy
|
bdbb99a1fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 10:11:20 +08:00 |
|
zyy
|
778387a0e9
|
调整扣车流程, 状态
|
2020-08-31 10:11:02 +08:00 |
|
fan
|
e6f7ade236
|
调度大赛调整
|
2020-08-31 09:23:12 +08:00 |
|
fan
|
bf381cb697
|
调度大赛调整
|
2020-08-28 18:04:46 +08:00 |
|
fan
|
589513759f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 17:57:56 +08:00 |
|
fan
|
818010b18f
|
调度大赛调整
|
2020-08-28 17:57:42 +08:00 |
|
zyy
|
d2b75185fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 17:47:30 +08:00 |
|
zyy
|
ae02d527c9
|
调整福州线路新版操作
|
2020-08-28 17:47:17 +08:00 |
|
sunzhenyu
|
4668783e72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 17:27:00 +08:00 |
|
sunzhenyu
|
ed00bc646b
|
修复三维驾驶切车后未复位模型
|
2020-08-28 17:26:51 +08:00 |
|
zyy
|
5dcfee72d6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 17:22:26 +08:00 |
|
zyy
|
adb62a3209
|
增加列车右键操作，调整配置
|
2020-08-28 17:22:12 +08:00 |
|
fan
|
ba505a899e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 16:58:33 +08:00 |
|
fan
|
a28f7a3975
|
调度大赛调整
|
2020-08-28 16:58:17 +08:00 |
|
joylink_cuiweidong
|
576c62bf4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 16:52:33 +08:00 |
|
joylink_cuiweidong
|
d5dabca2c6
|
代码调整
区段（parentCode）字段处理
|
2020-08-28 16:52:19 +08:00 |
|
fan
|
56aefdb207
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 15:28:37 +08:00 |
|
fan
|
16a4b0fb84
|
调度大赛调整
|
2020-08-28 15:28:24 +08:00 |
|