Commit Graph

12697 Commits

Author SHA1 Message Date
joylink_cuiweidong
f4fb2d7cbf 代码调整 2022-11-28 18:34:08 +08:00
fan
4f7476c540 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-28 17:59:23 +08:00
fan
9ffd70de63 菜单调整 2022-11-28 17:59:12 +08:00
joylink_cuiweidong
fd99287e10 项目设备绑定角色 2022-11-28 17:06:39 +08:00
dong
e7db5f7173 代码调整 2022-11-28 16:41:36 +08:00
joylink_cuiweidong
6a1bf40183 代码调整 2022-11-28 15:57:36 +08:00
joylink_cuiweidong
98e1a75705 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-28 15:17:58 +08:00
joylink_cuiweidong
98ed313a1d 代码调整 2022-11-28 15:17:43 +08:00
dong
dc9e7972e2 代码调整 2022-11-28 13:37:04 +08:00
dong
19b90ab854 代码调整 2022-11-28 13:31:06 +08:00
fan
a69ef7590e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-28 10:46:30 +08:00
fan
15dafc301d 新增路票簿册客户端 2022-11-28 10:46:04 +08:00
joylink_cuiweidong
751ff10406 代码调整 2022-11-28 10:45:31 +08:00
dong
e8b8147aee 代码调整 2022-11-25 18:33:55 +08:00
joylink_cuiweidong
ace5268922 代码调整 2022-11-24 18:15:46 +08:00
joylink_cuiweidong
60d16a2c33 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-24 17:37:46 +08:00
joylink_cuiweidong
92e26e06f1 后端项目配置添加 实习室关联的功能 2022-11-24 17:37:29 +08:00
dong
602184feaf 代码调整 2022-11-24 11:27:16 +08:00
dong
d1bfbe0aad 代码调整 2022-11-23 18:08:17 +08:00
fan
7a66fd7416 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-11-23 18:04:43 +08:00
fan
aaf5912a2e 实训调整 2022-11-23 18:04:35 +08:00
joylink_cuiweidong
fbf5ab2e33 代码调整 2022-11-23 17:39:38 +08:00
joylink_cuiweidong
e5ff37427d 设备登录 教研机登录 代码调整 2022-11-23 16:57:15 +08:00
joylink_cuiweidong
879719ed4b 项目前端配置 添加 关联地图 设备功能 2022-11-23 14:56:59 +08:00
dong
08dbe1c7b4 调整组织关系管理路由 2022-11-23 11:26:59 +08:00
fan
20d4c147f6 指令发送调整 2022-11-23 11:15:13 +08:00
fan
4c5e694c9a 查询进路控制模式调整 2022-11-23 11:01:50 +08:00
fan
206dbd1219 11.22修改意见部分调整 2022-11-23 10:37:52 +08:00
fan
32d97e6648 场景设计中切了司机角色后,切不了行调 2022-11-22 17:11:54 +08:00
fan
2825615114 动态计算仿真操作模式 2022-11-22 16:36:53 +08:00
fan
00e2b3231a 实训设计盘高度调整 2022-11-22 16:24:35 +08:00
fan
d0d77bd350 取消进路调整 2022-11-22 16:02:36 +08:00
fan
fbeef9c6b5 仿真重置 & 实训重置接口调整 2022-11-22 15:41:31 +08:00
fan
1ea7343267 问题调整 2022-11-22 15:30:51 +08:00
fan
2b0ec10e81 暂替 2022-11-22 13:30:32 +08:00
fan
e2d6307efc menuBarConvert递归调整 2022-11-22 10:55:52 +08:00
fan
6601bdac1b 福州一menuBar 调整 2022-11-22 09:50:53 +08:00
fan
00c2dfc377 发送指令后清除operations 2022-11-22 09:28:35 +08:00
fan
47c2dffec9 问题调整 2022-11-18 17:35:56 +08:00
fan
e0dd6ae248 问题调整 2022-11-18 16:50:41 +08:00
fan
d3be671ad9 应急调度仿真调整 2022-11-17 10:13:15 +08:00
fan
50dbd0bdae Merge remote-tracking branch 'origin/test' into test_dispaly1
# Conflicts:
#	src/App.vue
#	src/jmapNew/shape/graph/Train/EMouse.js
#	src/views/demonstration/detail/index.vue
#	src/views/trainingPlatform/demonList.vue
2022-11-16 14:56:09 +08:00
fan
9edb55d72c 应急调度仿真 2022-11-16 14:49:46 +08:00
fan
4dc10f4377 代码调整 2022-11-16 11:06:57 +08:00
fan
b3d62115ec 实训校验调整 2022-11-15 13:20:44 +08:00
fan
c1f0bd6fa7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
 Conflicts:
	src/store/modules/trainingNew.js
	src/views/newMap/display/terminals/localWork.vue
2022-11-09 15:08:32 +08:00
fan
92a3e85f93 实训校验暂提 2022-11-09 15:06:47 +08:00
fan
64c58f511b 实训调整 2022-11-09 14:47:42 +08:00
fan
42592522bb 实训调整 2022-11-08 17:55:22 +08:00
fan
ecd1fe83d7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-08 10:53:23 +08:00