Commit Graph

12775 Commits

Author SHA1 Message Date
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
fan
5c53092511 调整:实训步骤记录增加数据校验 2023-02-13 15:18:37 +08:00
fan
176068f6c8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-13 14:34:53 +08:00
fan
e76dd0777a BUG:【考试】场景实训做了一步后点击结束,再交卷,没有分数,并且这道题显示未做状态 2023-02-13 14:34:38 +08:00
dong
e7c7e23602 代码调整 2023-02-13 14:16:20 +08:00
fan
f4180c579c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-13 14:09:04 +08:00
fan
5452d49b05 调整:联动道岔判断增加限制条件 2023-02-13 14:08:46 +08:00
dong
8a8e47e1eb 薄册代码调整 2023-02-13 13:45:28 +08:00
joylink_cuiweidong
ab2a68865d 司机 ATS客户端 添加列车指令 2023-02-13 11:32:00 +08:00
fan
8d6b60ba5d BUG:考试加载实训区分场景实训处理 2023-02-13 11:28:38 +08:00
57d5bb0674 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-02-13 10:59:06 +08:00
joylink_cuiweidong
27a99a7013 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-13 10:58:50 +08:00
joylink_cuiweidong
595dcf0374 大铁线路 分路不良 输入密码操作 2023-02-13 10:58:33 +08:00
fan
296594bc8e 调整:校验实训联动道岔判断调整 2023-02-10 17:09:40 +08:00
fan
09f27b7bfa 调整:实训记录提交过滤非本人步骤 2023-02-10 16:07:35 +08:00
fan
f1cbec026e 调整:考试规则场景实训扮演角色显示调整 2023-02-10 15:19:22 +08:00
fan
66f51b024f 调整:引导总锁鼠标移除样式调整 2023-02-10 15:04:50 +08:00
fan
707702d231 试卷规则扮演角色disabled调整 2023-02-10 14:13:49 +08:00
fan
60d1868850 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-10 13:41:20 +08:00
fan
be8154db27 BUG: 【考试管理】试卷定义时,选择场景实训需要改成不随机出题,直接展示该线路下所有场景以供选择,并在此可以定义场景的角色(只能选一个),考试时用户不需要选择角色,直接开始考试 2023-02-10 13:41:04 +08:00
joylink_cuiweidong
c071b6a98d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-10 11:09:26 +08:00
joylink_cuiweidong
7a04b580b8 添加 电力工务 角色 2023-02-10 11:09:10 +08:00
dong
36b4d0382a 处理大铁CTC仿真成员删除无反应问题 2023-02-10 10:13:08 +08:00
fan
80687fd3f0 BUG: 如果是文本会话消息没有audioPath时跳过自动播放 2023-02-10 10:04:05 +08:00
fan
4323ed274e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-10 09:42:11 +08:00
dong
7e7bb8ded9 添加学生时增加手机号参数 2023-02-09 18:36:15 +08:00
joylink_cuiweidong
bfd75b723b 代码调整 2023-02-09 18:11:52 +08:00
joylink_cuiweidong
fded75dd85 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-09 18:09:26 +08:00
joylink_cuiweidong
ac8ab5a6cc 司机添加ATS客户端 2023-02-09 18:09:11 +08:00
dong
22e9d81183 取消场景定位 2023-02-09 16:16:03 +08:00
dong
ef55fb847d 代码调整 2023-02-09 15:03:08 +08:00
fan
ba0007807b 调整:考试试题提交接口参数调整 2023-02-09 14:59:45 +08:00
dong
85bc2e7fd1 代码调整 2023-02-09 11:46:37 +08:00
fan
51b85082dd 调整:簿册查询不录制操作 2023-02-09 11:03:34 +08:00
fan
9ef0780377 优化:实训评分规则总分自动统计 2023-02-09 10:34:04 +08:00
fan
7fc9e0fab4 优化:实训评分规则提示脱离文本 2023-02-09 10:14:56 +08:00
fan
ac05654672 BUG:实训未结束时点击了理论题,然后再点击实训题无法打开实训组件 2023-02-09 09:40:18 +08:00
fan
eb17b90d82 仿真=》权限 去除剩余数量一栏 2023-02-09 09:34:46 +08:00
fan
eb8bc61b90 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-09 09:28:46 +08:00
fan
06214aa258 大铁CTC引导总锁 2023-02-09 09:28:32 +08:00
joylink_cuiweidong
2cf1412706 代码调整 2023-02-08 18:17:21 +08:00
joylink_cuiweidong
c448e8c9f3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-08 17:43:31 +08:00
joylink_cuiweidong
150ede0cb9 代码调整 2023-02-08 17:43:09 +08:00
dong
0583f03479 代码调整 2023-02-08 16:31:59 +08:00
joylink_cuiweidong
362caf8ef1 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-08 15:20:08 +08:00
joylink_cuiweidong
52970e9e9a 【仿真功能】iscs界面,屏蔽门系统切换车站时以前是有订阅的,现在没了 2023-02-08 15:19:48 +08:00
fan
cdd3ee9cc4 实训考试成绩调整 2023-02-08 13:28:31 +08:00
fan
ce95ce4868 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-08 13:13:19 +08:00
fan
70277b3f24 实训成绩调整 2023-02-08 13:12:47 +08:00
dong
967c3e8a01 代码调整 2023-02-08 11:13:43 +08:00
joylink_cuiweidong
b94a5d4842 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-08 11:03:32 +08:00
joylink_cuiweidong
87c157a885 代码调整 2023-02-08 11:03:01 +08:00
dong
5a6106e8a1 代码调整 2023-02-08 10:59:38 +08:00
dong
18ebca3ee6 代码调整 2023-02-08 09:33:45 +08:00
dong
3569a90a9a 薄册--防洪安全上岗签到表 2023-02-07 18:27:16 +08:00
joylink_cuiweidong
5fbf197be4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-07 18:19:22 +08:00
joylink_cuiweidong
f579d37e79 CTC客户端的分路不良 代码调整 2023-02-07 18:18:50 +08:00
fan
96eb526713 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-02-07 18:00:59 +08:00
fan
d1611f900f ibp,psl增加操作 2023-02-07 18:00:49 +08:00
fan
de7ee599f5 ibp,psl增加操作 2023-02-07 18:00:41 +08:00
joylink_cuiweidong
c81190b284 代码调整 2023-02-07 16:45:34 +08:00
joylink_cuiweidong
31f0b61e68 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-02-07 15:58:34 +08:00
joylink_cuiweidong
06c2d12354 CTC客户端的分路不良 2023-02-07 15:58:20 +08:00