fan
|
d184687860
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/simulationMenu.vue
|
2022-09-21 09:16:40 +08:00 |
|
joylink_cuiweidong
|
b82a1c535a
|
代码调整
|
2022-09-20 18:05:02 +08:00 |
|
dong
|
bc9d81c301
|
代码调整
|
2022-09-20 17:54:14 +08:00 |
|
fan
|
2892517d36
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-20 17:41:33 +08:00 |
|
fan
|
b85fc187a0
|
iScs语音广播调整
|
2022-09-20 17:41:01 +08:00 |
|
dong
|
8fb99c668d
|
窗口间通信
|
2022-09-20 17:25:21 +08:00 |
|
fan
|
198c8fb170
|
暂提
|
2022-09-20 17:21:01 +08:00 |
|
fan
|
a49f1b2c7a
|
ISCS语音播放1
|
2022-09-20 16:20:48 +08:00 |
|
joylink_cuiweidong
|
5c948ea596
|
北交大 项目 菜单代码调整
|
2022-09-20 16:17:02 +08:00 |
|
fan
|
fda7794512
|
ISCS语音播放
|
2022-09-20 16:03:08 +08:00 |
|
fan
|
761a96997d
|
实训校验调整
|
2022-09-20 15:35:57 +08:00 |
|
fan
|
91c04e97b1
|
暂提
|
2022-09-20 14:22:44 +08:00 |
|
fan
|
e970ca2792
|
生成音频资源
|
2022-09-20 10:43:40 +08:00 |
|
fan
|
d5e9c55fcd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-20 10:19:21 +08:00 |
|
fan
|
50745ec076
|
实训步骤id调整
|
2022-09-20 10:18:59 +08:00 |
|
joylink_cuiweidong
|
ce81e65464
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-09-19 18:07:55 +08:00 |
|
joylink_cuiweidong
|
f455f52f65
|
代码调整
|
2022-09-19 18:06:37 +08:00 |
|
Yuan
|
3266a7478d
|
Merge branch 'yly' into test
|
2022-09-19 18:02:23 +08:00 |
|
Yuan
|
9b9f0ebfa9
|
仿真时间修改统一
|
2022-09-19 18:01:57 +08:00 |
|
fan
|
011b768adf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-19 17:55:30 +08:00 |
|
fan
|
41d8635b73
|
加载实训时清除实训分数
|
2022-09-19 17:55:19 +08:00 |
|
dong
|
3118d77bf1
|
代码调整
|
2022-09-19 17:06:17 +08:00 |
|
fan
|
62d864d996
|
代码调整
|
2022-09-19 16:58:18 +08:00 |
|
joylink_cuiweidong
|
fc9f284ee1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-09-19 16:56:22 +08:00 |
|
joylink_cuiweidong
|
718c69c04b
|
实训 评分代码调整
|
2022-09-19 16:56:10 +08:00 |
|
dong
|
e5174d7796
|
代码调整
|
2022-09-19 16:35:57 +08:00 |
|
joylink_cuiweidong
|
402eb691d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-09-19 16:04:21 +08:00 |
|
joylink_cuiweidong
|
806b237ae7
|
代码调整
|
2022-09-19 16:04:07 +08:00 |
|
dong
|
62904d9056
|
添加设置调度台数据界面
|
2022-09-19 15:39:55 +08:00 |
|
dong
|
f2f5a964ec
|
代码调整
|
2022-09-19 15:07:09 +08:00 |
|
fan
|
13406673f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-19 14:30:12 +08:00 |
|
fan
|
2716f015db
|
实训调整
|
2022-09-19 14:29:58 +08:00 |
|
dong
|
d65e004529
|
代码调整
|
2022-09-19 14:03:02 +08:00 |
|
dong
|
847c388fae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-09-19 13:23:30 +08:00 |
|
dong
|
4b9ae158a5
|
实训设计添加车务终端管理、路票、薄册
|
2022-09-19 13:23:07 +08:00 |
|
fan
|
07cf9f0ca7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-19 11:08:30 +08:00 |
|
fan
|
a05e429d96
|
代码调整
|
2022-09-19 11:08:13 +08:00 |
|
dong
|
bddde1e239
|
实训设计添加调度台和车务终端
|
2022-09-19 11:01:45 +08:00 |
|
joylink_cuiweidong
|
b79202c70e
|
代码调整
|
2022-09-16 15:28:44 +08:00 |
|
fan
|
d8c4a1278c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-16 14:59:47 +08:00 |
|
fan
|
028e533ba2
|
实训调整
|
2022-09-16 14:59:34 +08:00 |
|
joylink_cuiweidong
|
9657620d15
|
大铁线路 终端切换代码调整
|
2022-09-16 14:47:15 +08:00 |
|
Yuan
|
d506294b40
|
Merge branch 'yly' into test
|
2022-09-16 14:28:40 +08:00 |
|
Yuan
|
d32825769e
|
PIS数据
|
2022-09-16 14:28:24 +08:00 |
|
dong
|
956bf7e7fd
|
代码调整
|
2022-09-15 18:12:51 +08:00 |
|
Yuan
|
e5ccd6d525
|
resolve conflict
|
2022-09-15 18:08:32 +08:00 |
|
joylink_cuiweidong
|
bf4b376d04
|
代码调整
|
2022-09-15 18:04:30 +08:00 |
|
Yuan
|
8fed7739e3
|
WIP: PIS
|
2022-09-15 18:03:49 +08:00 |
|
fan
|
ea99a2ed09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-15 17:48:07 +08:00 |
|
fan
|
e766d714b7
|
实训调整
|
2022-09-15 17:43:11 +08:00 |
|