Commit Graph

12435 Commits

Author SHA1 Message Date
fan
fe68d15acf 大客流订阅调整 2022-11-07 18:00:26 +08:00
fan
2caebf5d20 线路功能批量生成提示 2022-11-07 16:37:26 +08:00
fan
19bb41b0d8 大铁实训设计没有根据角色切换显示&语音指令 2022-11-07 16:15:22 +08:00
fan
deeaba2690 大铁控制条被遮盖&大铁综合演练成员管理切换角色后画面没有切换 2022-11-07 13:40:59 +08:00
fan
9b3562b861 权限调接口错误 2022-11-07 10:38:55 +08:00
fan
6a03ce8a11 画面管理副标题bug 调整 2022-11-07 10:32:45 +08:00
fan
078b07f863 线路功能 无itemMap属性导致报错调整 2022-11-07 10:14:32 +08:00
dong
2a9e230ff9 代码调整 2022-11-04 15:58:14 +08:00
dong
15effd12f4 代码调整 2022-11-04 15:42:52 +08:00
dong
cb5da8a7b2 代码调整 2022-11-03 18:32:36 +08:00
fan
1443d7d2fa 画面调整 2022-11-03 17:46:57 +08:00
fan
0d6f548e6e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-03 16:27:47 +08:00
fan
32ea838b58 画面调整 2022-11-03 16:27:38 +08:00
dong
c363127e9a 代码调整 2022-11-03 16:23:52 +08:00
fan
551ebe9fc7 画面调整 2022-11-03 15:38:55 +08:00
fan
f86a8f20c5 调整 2022-11-03 14:26:17 +08:00
fan
29dd0c4c8b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-02 18:05:45 +08:00
fan
74dbc5cff3 调整 2022-11-02 18:05:37 +08:00
dong
8794db68f2 代码调整 2022-11-02 17:56:27 +08:00
fan
c92c66f17c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
 Conflicts:
	src/store/modules/training.js
	src/views/newMap/display/index.vue
	src/views/newMap/display/simulationControl.vue
	src/views/publish/publishMap/editSubsystem.vue
2022-11-02 17:25:45 +08:00
fan
de0be8d66e 线路功能调整 2022-11-02 17:20:57 +08:00
dong
d79c8986bd 代码调整 2022-11-02 16:25:37 +08:00
dong
c64d2f95a6 代码调整 2022-11-02 16:03:39 +08:00
dong
b623a0734e 代码调整 2022-11-02 15:48:50 +08:00
dong
34a4e92073 代码调整 2022-11-02 15:07:36 +08:00
fan
f7418db43c 代码调整 2022-11-02 14:23:03 +08:00
fan
6c02aba151 实训调整 2022-11-02 14:19:55 +08:00
dong
215fb23f20 代码调整 2022-11-02 13:30:07 +08:00
dong
42112659c5 代码调整 2022-11-02 10:28:22 +08:00
joylink_cuiweidong
a91f0063d0 代码调整 2022-11-01 18:09:16 +08:00
joylink_cuiweidong
45243e1968 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-01 18:09:06 +08:00
fan
b08def49ee Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-01 18:07:52 +08:00
fan
a9b47a5a4a 代码调整 2022-11-01 18:07:26 +08:00
joylink_cuiweidong
ad0f92a0e6 代码调整 2022-11-01 18:03:31 +08:00
joylink_cuiweidong
295e1246ab 代码调整 2022-11-01 18:01:21 +08:00
dong
6fb8812039 实训设计调整 2022-11-01 17:45:36 +08:00
joylink_cuiweidong
ae09b3b073 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
#	src/views/trainingPlatform/simulation.vue
2022-11-01 17:33:12 +08:00
joylink_cuiweidong
49d15b50a1 代码调整 2022-11-01 17:31:49 +08:00
dong
8c924507bc 代码调整 2022-11-01 14:11:22 +08:00
dong
e67179c3c6 代码调整 2022-11-01 14:07:24 +08:00
dong
002a2fddd2 代码调整 2022-11-01 14:02:40 +08:00
dong
88aec8f6dd 代码调整 2022-11-01 10:55:17 +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
dong
64dd376229 调整权限管理 2022-10-31 18:24:47 +08:00
joylink_cuiweidong
56b2885fba 代码调整 2022-10-31 17:05:17 +08:00
joylink_cuiweidong
88cec5d2b0 项目客户端前端配置 logo图片更换 代码调整 2022-10-31 16:50:12 +08:00
joylink_cuiweidong
e9fc041b03 代码调整 2022-10-31 16:32:54 +08:00
fan
e67d26ddf9 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
 Conflicts:
	src/views/publish/publishMap/editSubsystem.vue
2022-10-31 14:34:14 +08:00
fan
ce6781e1d9 线路功能调整 2022-10-31 14:31:34 +08:00