Commit Graph

3027 Commits

Author SHA1 Message Date
joylink_cuiweidong
49d15b50a1 代码调整 2022-11-01 17:31:49 +08:00
fan
071143992e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-01 09:29:33 +08:00
fan
fe500964e3 客户端调整 2022-11-01 09:29:21 +08:00
joylink_cuiweidong
56b2885fba 代码调整 2022-10-31 17:05:17 +08:00
joylink_cuiweidong
e9fc041b03 代码调整 2022-10-31 16:32:54 +08:00
joylink_cuiweidong
863448fb4a 代码调整 2022-10-28 18:34:09 +08:00
joylink_cuiweidong
a8e2683693 实训预览 代码调整 2022-10-28 18:17:28 +08:00
joylink_cuiweidong
2156ac1880 代码调整 2022-10-28 17:49:51 +08:00
joylink_cuiweidong
c57b4f6814 代码调整 2022-10-28 16:06:21 +08:00
dong
6c1903a6a0 实训设计 2022-10-28 15:20:26 +08:00
joylink_cuiweidong
599bf4f722 代码调整 2022-10-28 10:18:00 +08:00
joylink_cuiweidong
a2c685d6bb 实训管理代码调整 2022-10-27 18:13:03 +08:00
joylink_cuiweidong
1381bd8a9c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-26 18:17:36 +08:00
joylink_cuiweidong
75f7165750 实训管理代码调整 2022-10-26 18:16:54 +08:00
fan
9e4576d30c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-25 18:02:42 +08:00
joylink_cuiweidong
7dee28ea8e 代码调整 2022-10-25 17:23:44 +08:00
joylink_cuiweidong
21b526bce0 代码调整 2022-10-25 15:18:22 +08:00
fan
205fce9512 代码调整 2022-10-25 10:45:23 +08:00
joylink_cuiweidong
6d20dcb132 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-24 18:21:16 +08:00
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
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
a11c8d8829 理论考试提交 2022-10-24 13:47:36 +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
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
baf089d889 大客流策略客户端 代码调整 2022-10-21 15:52:20 +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
Yuan
2601028c19 WIP: 考试 2022-10-20 18:22:56 +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
19db91123c 设备右键菜单暂提 2022-10-19 15:32:56 +08:00
fan
1764b10908 代码调整 2022-10-17 18:03:31 +08:00
fan
470260e03d 代码调整 2022-10-17 15:40:33 +08:00
fan
cb19a6b423 代码调整 2022-10-14 18:02:22 +08:00
joylink_cuiweidong
7260d592ea Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 15:43:44 +08:00
joylink_cuiweidong
170be716d3 代码调整 2022-10-14 15:43:30 +08:00
fan
4434420415 地图绘制返回调整 2022-10-14 15:31:58 +08:00