joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
12,188 Commits 20 Branches 0 Tags 448 MiB
c6af3c8027
Commit Graph

7473 Commits

Author SHA1 Message Date
Yuan
285e9b8ab6 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:30:11 +08:00
Yuan
06ff678a48 图片URL修改 2022-09-23 16:30:05 +08:00
dong
b1d6d3ba3f 实训设计添加按钮Id 2022-09-23 16:22:46 +08:00
Yuan
d388631b60 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:12:05 +08:00
Yuan
21e3d49f48 车辆和站台PIS增加背景图 2022-09-23 16:11:59 +08:00
joylink_cuiweidong
d6a3be6bc1 代码调整 2022-09-23 14:43:05 +08:00
dong
255964bfe3 代码调整 2022-09-23 14:11:08 +08:00
Yuan
99a364abf9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 11:18:34 +08:00
Yuan
b6401aef96 ISCS 信息发布修改 2022-09-23 11:18:27 +08:00
joylink_cuiweidong
6b6ea5d741 代码调整 2022-09-23 10:39:50 +08:00
fan
55570dbc03 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-23 09:41:08 +08:00
fan
8d2a995fba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-23 09:20:26 +08:00
fan
f0ee41a06c pa 时间处理 2022-09-23 09:20:06 +08:00
Yuan
6313b17345 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-22 18:21:28 +08:00
Yuan
8d314acc54 PIS滚动信息修改 && ISCS车站广播 2022-09-22 18:19:40 +08:00
fan
22355cf11a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-22 17:41:00 +08:00
fan
768af89057 ISCS资源增加类型 2022-09-22 17:40:50 +08:00
dong
c76ca2288c 代码调整 2022-09-22 17:03:13 +08:00
fan
986fe7eada PA系统调整 2022-09-22 16:58:23 +08:00
joylink_cuiweidong
a4a009b808 代码调整 2022-09-22 16:43:25 +08:00
joylink_cuiweidong
e9256df83b 代码调整 2022-09-22 13:11:34 +08:00
fan
d68008ad83 代码调整 2022-09-22 09:04:32 +08:00
joylink_zhangsai
80b509464a 修改PA系统语音播放bug 2022-09-21 15:41:53 +08:00
fan
63d02669dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-21 14:13:54 +08:00
fan
61ff3e0c73 设备管理配置接口调整 2022-09-21 14:13:42 +08:00
fan
77cbbea8e2 暂提 2022-09-21 14:12:32 +08:00
dong
119d2b3c60 代码调整 2022-09-21 14:08:51 +08:00
joylink_cuiweidong
c7001e1946 代码调整 2022-09-21 13:20:40 +08:00
fan
d3a06586ba ISCS设备登录调整&&广播系统调整 2022-09-21 13:15:14 +08:00
fan
a15c916719 暂提 2022-09-21 10:17:36 +08:00
Yuan
bec6112216 PIS列车进站时间修改 2022-09-21 09:38:11 +08:00
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
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
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
dong
ff2536c90d 实训草稿发布轨迹 2022-09-15 17:34:09 +08:00
dong
e8c23acab7 代码调整 2022-09-15 14:23:58 +08:00
fan
63f4505ed9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-15 13:30:26 +08:00
dong
abf01b7945 代码调整 2022-09-15 13:15:17 +08:00
fan
2eca40ba41 用户密码重置和忘记密码调整 2022-09-15 13:05:11 +08:00
dong
01ef134ad3 代码调整 2022-09-15 11:30:06 +08:00
joylink_cuiweidong
0ccc33e64e 实训录制 评分 代码调整 2022-09-15 10:55:23 +08:00
joylink_cuiweidong
b72736813a 代码调整 2022-09-15 10:20:45 +08:00
dong
507e01ebe8 代码调整 2022-09-15 09:56:51 +08:00
dong
6adcfd9f9b 代码调整 2022-09-14 18:31:20 +08:00
Yuan
afabcfbf3b 时间处理 2022-09-14 18:17:28 +08:00
Yuan
0026faedfe Merge branch 'yly' into test 2022-09-14 17:21:54 +08:00
Yuan
bad5568564 PIS界面 2022-09-14 17:21:32 +08:00
joylink_cuiweidong
67bc0ba2db 代码调整 2022-09-14 16:45:08 +08:00
fan
aef684e320 实训调整 2022-09-14 16:44:44 +08:00
joylink_cuiweidong
bab3449b9a 代码调整 2022-09-14 16:16:20 +08:00
joylink_cuiweidong
cd9db0aa12 代码调整 2022-09-14 16:12:23 +08:00
fan
82857e9808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-14 13:28:18 +08:00
fan
ea8277adb7 实训调整 2022-09-14 13:28:06 +08:00
fan
d1f0d5e27f 武汉项目调整 2022-09-14 13:26:59 +08:00
dong
a33c796bbc 代码调整 2022-09-14 11:09:25 +08:00
joylink_cuiweidong
af30f5d08c 代码调整 2022-09-13 17:56:59 +08:00
joylink_cuiweidong
90554bd2be 代码调整 2022-09-13 17:37:26 +08:00
fan
d504639e15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-13 17:06:59 +08:00
fan
af06707a16 实训场景调整 2022-09-13 17:06:36 +08:00
joylink_cuiweidong
96411d34b7 代码调整 2022-09-13 17:04:08 +08:00
joylink_cuiweidong
289f02ac0f 教学系统 课程 现地 切换实训 地图显示代码调整 2022-09-13 13:35:14 +08:00
joylink_cuiweidong
d9a51cbcec 代码调整 2022-09-13 10:41:01 +08:00
dong
83736869c3 代码调整 2022-09-09 14:35:46 +08:00
Yuan
8bf8b0b742 Merge branch 'yly' into test 2022-09-09 13:47:46 +08:00
Yuan
f00756f2c2 由公里标批量计算区段实际长度 2022-09-09 13:47:26 +08:00
fan
e42537a8e4 实训调整 2022-09-09 13:06:12 +08:00
dong
18937861c4 添加会话domId 2022-09-08 17:12:16 +08:00
fan
4904e30450 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-08 15:37:41 +08:00
fan
5e70d4e0bf 代码调整 2022-09-08 15:37:30 +08:00
dong
778cdf2808 代码调整 2022-09-08 15:07:28 +08:00
fan
42cc8d9213 暂提 2022-09-08 09:45:46 +08:00
dong
09f78e9064 代码调整 2022-09-07 18:11:50 +08:00
dong
627faced59 条件表达式 2022-09-07 17:38:42 +08:00
fan
aea62ada61 增加prdType 2022-09-07 09:37:37 +08:00
fan
31f95a02c1 实训调整 2022-09-06 15:43:43 +08:00
fan
9e22641b95 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 17:55:52 +08:00
fan
6e049fd3e1 代码调整 2022-09-05 17:55:39 +08:00
joylink_cuiweidong
4a128b5f89 代码调整 2022-09-05 16:40:46 +08:00
fan
229528d1ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 15:48:10 +08:00
fan
9edc8a12ae 代码调整 2022-09-05 15:47:56 +08:00
fan
802cc70bfc 区段增加最大最小公里标 2022-09-05 15:47:14 +08:00
dong
4093d02a54 代码调整 2022-09-05 14:32:26 +08:00
dong
cb5179fafb 实训设计代码调整 2022-09-05 14:23:20 +08:00
dong
f7881c85e2 代码调整 2022-09-05 11:08:46 +08:00
dong
08449dd954 代码调整 2022-09-05 10:42:31 +08:00
fan
0d6f5c13f9 实训调整 2022-09-02 17:19:25 +08:00
fan
e7360ce946 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 17:03:57 +08:00
fan
0851691587 实训调整 2022-09-02 17:03:43 +08:00
dong
bcbb3e860b 代码调整 2022-09-02 16:50:26 +08:00
fan
97065ca162 实训调整 2022-09-02 15:19:32 +08:00
fan
b0cfbb3f35 实训调整 2022-09-02 15:07:37 +08:00
fan
cb3edd42a4 实训调整 2022-09-02 14:36:16 +08:00
fan
7aa2ffb953 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 10:28:41 +08:00
fan
aeeaac46e0 实训调整 2022-09-02 10:28:29 +08:00
joylink_cuiweidong
a99e6e44bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-02 10:22:46 +08:00
joylink_cuiweidong
9ee9e9ecdc 大铁项目 调度命令文件迁移到对应线路 2022-09-02 10:22:28 +08:00
fan
483536c721 实训调整 2022-09-02 10:00:44 +08:00
fan
0b32f34af2 实训调整 2022-09-02 09:45:51 +08:00
fan
663e19e870 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 16:24:06 +08:00
fan
8946835dca 实训调整 2022-09-01 16:10:04 +08:00
fan
678dcc3043 红河财经CCTV调整 2022-09-01 16:09:49 +08:00
dong
77ce75c91b 代码调整 2022-09-01 15:39:59 +08:00
dong
b3083b8dc8 代码调整 2022-09-01 13:54:10 +08:00
fan
7f5f1e7851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 13:38:29 +08:00
fan
4694f0455c 实训提示 2022-09-01 13:38:11 +08:00