Commit Graph

12542 Commits

Author SHA1 Message Date
joylink_cuiweidong
1475848fea 综合演练代码调整 2022-10-24 18:20:45 +08:00
Yuan
d4538b441d Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-24 18:13:47 +08:00
Yuan
90a1c03bd4 考试面板样式修改 2022-10-24 18:13:43 +08:00
fan
67492c4e90 代码调整 2022-10-24 17:34:14 +08:00
fan
20354a0389 语音指令识别错误提示 2022-10-24 16:44:15 +08:00
fan
cb61f11753 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-24 16:41:53 +08:00
fan
18f1c6231b 大铁菜单调整 2022-10-24 16:41:38 +08:00
joylink_cuiweidong
1d565398e9 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-24 16:21:52 +08:00
joylink_cuiweidong
63c362635a 代码调整 2022-10-24 16:21:38 +08:00
Yuan
4e0635b7ad 考试-理论 2022-10-24 15:31:54 +08:00
Yuan
8976cfd474 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-24 13:47:44 +08:00
Yuan
a11c8d8829 理论考试提交 2022-10-24 13:47:36 +08:00
dong
9cd804e2b7 代码调整 2022-10-24 13:24:40 +08:00
Yuan
0fe83a4f31 考试-理论 2022-10-24 13:16:01 +08:00
Yuan
44fcdee7cf WIP:考试面板 2022-10-24 13:12:14 +08:00
joylink_cuiweidong
b1b00fd57b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-24 10:42:52 +08:00
joylink_cuiweidong
2e492ad27f CCTV去掉删除按钮 2022-10-24 10:41:36 +08:00
fan
32409d4baf 代码调整 2022-10-24 10:03:46 +08:00
fan
bcca6e1db0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-21 18:03:45 +08:00
fan
fb0d06a491 代码调整 2022-10-21 18:03:36 +08:00
joylink_cuiweidong
bc48d4c82e 代码调整 2022-10-21 16:53:24 +08:00
joylink_cuiweidong
16beaf8f94 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
#	src/views/newMap/display/terminals/index.vue
#	src/views/newMap/display/terminals/terminalMenu.vue
2022-10-21 16:49:14 +08:00
joylink_cuiweidong
42dc17d87e 大客流视图代码调整 2022-10-21 16:46:35 +08:00
fan
afa5a9aeab Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
 Conflicts:
	src/views/newMap/display/terminals/index.vue
	src/views/newMap/display/terminals/terminalMenu.vue
2022-10-21 16:12:55 +08:00
fan
354192e953 代码调整 2022-10-21 16:10:05 +08:00
joylink_cuiweidong
363cd1fda9 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-21 15:52:37 +08:00
joylink_cuiweidong
baf089d889 大客流策略客户端 代码调整 2022-10-21 15:52:20 +08:00
dong
a97d34d3f3 功能管理和权限管理调整 2022-10-21 15:21:15 +08:00
joylink_cuiweidong
583830d573 修改三维图片和数据的地址 2022-10-21 14:15:58 +08:00
joylink_cuiweidong
b0431f00f8 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-10-21 11:30:35 +08:00
joylink_cuiweidong
34ff82d6e9 菜单添加实训按钮 代码调整 2022-10-21 10:38:36 +08:00
fan
f2ac931350 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-21 09:52:46 +08:00
fan
1b90935de6 代码调整 2022-10-21 09:52:27 +08:00
Yuan
2601028c19 WIP: 考试 2022-10-20 18:22:56 +08:00
fan
812ef04cbd Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 17:57:52 +08:00
fan
c8c9ec4b43 代码调整 2022-10-20 17:57:41 +08:00
joylink_cuiweidong
090b07bb41 代码调整 2022-10-20 17:56:55 +08:00
joylink_cuiweidong
85e0abea4a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 16:23:16 +08:00
joylink_cuiweidong
77d0488450 代码调整 2022-10-20 16:22:56 +08:00
fan
f1ab35ce4b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 15:12:02 +08:00
fan
d0eed68a4b 代码调整 2022-10-20 15:11:40 +08:00
joylink_cuiweidong
63e86119ef 代码调整 2022-10-20 14:29:18 +08:00
dong
66b6a7fbf9 代码调整 2022-10-20 11:15:58 +08:00
joylink_cuiweidong
8dbc06409e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 11:01:28 +08:00
joylink_cuiweidong
abfde166ba 代码调整 2022-10-20 11:01:12 +08:00
dong
b06248a366 理论题目添加清空操作 2022-10-20 10:17:38 +08:00
fan
42b17a0217 列车信息缩放调整 2022-10-20 09:42:47 +08:00
dong
2754e14bff 代码调整 2022-10-19 18:46:22 +08:00
fan
eb3a39aee9 武汉8号线调整 2022-10-19 18:17:03 +08:00
dong
0d6f6dda1c 理论题目导入调整 2022-10-19 18:15:17 +08:00