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 |
|
fan
|
4438debc22
|
项目登录仿真里的返回按钮点击无效&prdType转换
|
2022-11-08 10:53:07 +08:00 |
|
dong
|
8b45548a55
|
代码调整
|
2022-11-07 18:17:22 +08:00 |
|
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 |
|