Commit Graph

13210 Commits

Author SHA1 Message Date
dong
cf5e633187 代码调整 2023-02-20 14:19:12 +08:00
fan
dd0fd19720 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-02-18 12:21:23 +08:00
fan
640b609831 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-18 12:18:25 +08:00
fan
de7623b475 发布报错调整 2023-02-18 12:18:09 +08:00
dong
35cd45786f 代码调整 2023-02-17 18:15:55 +08:00
fan
85ca94a66a Merge remote-tracking branch 'origin/test_dispaly' into test 2023-02-17 18:15:07 +08:00
dong
960e16dfa2 代码调整 2023-02-17 18:05:16 +08:00
dong
9697bf81f8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-17 17:59:18 +08:00
dong
8b38960f14 代码调整 2023-02-17 17:58:59 +08:00
fan
d4ce77e8bc 撤销:重复修改 权限分发到指定用户页面 2023-02-17 16:37:20 +08:00
fan
b07d540134 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-17 16:18:08 +08:00
fan
6ae073a557 调整:权限分发到指定用户添加账户查询条件 2023-02-17 16:18:00 +08:00
dong
4005b3783d 修改权限分发到指定用户弹窗和账号管理界面一致 2023-02-17 16:14:25 +08:00
fan
fd87f62c25 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-17 15:59:50 +08:00
fan
39f2019251 调整:仿真退出未重置activeTrainList 2023-02-17 15:59:40 +08:00
dong
25fcd0d671 代码调整 2023-02-17 15:49:44 +08:00
dong
fcb9ce5e08 模式转换功能调整 2023-02-17 15:01:59 +08:00
dong
2c41be9df5 代码调整 2023-02-17 11:23:02 +08:00
fan
7cfa33ecc0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-17 10:36:53 +08:00
fan
73514ebc1f Bug:参演角色重复问题修复 2023-02-17 10:36:22 +08:00
dong
abdfcaef41 调整模式转换 2023-02-17 09:51:09 +08:00
fan
f38fb8891a 调整:驾驶至目的地添加清除操作 2023-02-16 17:28:17 +08:00
fan
0c6ef6e834 调整:删除触发故障操作 2023-02-16 17:27:01 +08:00
fan
fc36b56ef7 调整:实训增加立即执行操作(判断逻辑调整) 2023-02-16 14:02:27 +08:00
fan
90c74ee23c 调整:实训增加立即执行操作 2023-02-16 13:17:25 +08:00
fan
3dc5c22bf0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-16 10:36:46 +08:00
fan
9e066023e7 调整:场景实训参演角色可编辑 2023-02-16 10:36:34 +08:00
dong
cdd5b07d9b 代码调整 2023-02-16 10:05:48 +08:00
joylink_cuiweidong
be3ca9fbf4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
2023-02-15 18:26:50 +08:00
joylink_cuiweidong
2d8d1d3c11 代码调整 2023-02-15 18:25:09 +08:00
fan
00a1137a9a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-15 16:38:15 +08:00
fan
57bb7acc60 线路功能增加背景图片 2023-02-15 16:38:00 +08:00
dong
97c5ebfcaf 代码调整 2023-02-15 15:43:45 +08:00
dong
baa1df1bbb 添加状态选择 2023-02-15 15:32:42 +08:00
fan
1d428805f3 泰国项目新增列车沙盘控制 2023-02-15 11:08:49 +08:00
fan
ab6c05b03e 调整:考试实训已做题目 区别显示 2023-02-15 10:36:39 +08:00
fan
9dc9be66f7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-14 17:32:15 +08:00
fan
f6040af47b 应急调度指挥项目列车计算位置调整 2023-02-14 17:31:53 +08:00
joylink_cuiweidong
90e0084247 代码调整 2023-02-14 17:09:17 +08:00
fan
c44983c4a5 BUG:会话框滚动条计算调整 2023-02-14 15:23:10 +08:00
fan
b02267b9c7 代码删除 2023-02-14 14:55:55 +08:00
fan
01aebf47f3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-14 14:48:25 +08:00
fan
bcec47c0c6 大铁CTC点击已办理引导总锁按钮执行取消引导总锁 2023-02-14 14:48:04 +08:00
joylink_cuiweidong
7c0508048a 大铁线路 分路不良 输入密码操作 代码调整 2023-02-13 17:54:48 +08:00
joylink_cuiweidong
b483d739cb 代码调整 2023-02-13 16:12:45 +08:00
joylink_cuiweidong
bd3352cd8b 代码调整 2023-02-13 16:07:31 +08:00
joylink_cuiweidong
7fd32ec138 代码调整 2023-02-13 16:00:01 +08:00
joylink_cuiweidong
ffbc056569 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-13 15:56:59 +08:00
joylink_cuiweidong
bd43b7c511 代码调整 2023-02-13 15:54:45 +08:00
fan
a91188d655 BUG:应急调度指挥列车缩放调整 2023-02-13 15:36:45 +08:00