Commit Graph

13230 Commits

Author SHA1 Message Date
fan
5887fada7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-09 17:08:13 +08:00
fan
0ce2ed98bd 宁波一报警信息 2023-05-09 17:08:02 +08:00
dong
4cae954cd8 修改beijing01实训时现地切换到行调时操作按钮未置空导致报错 2023-05-09 14:09:05 +08:00
dong
c065542c22 修改报警详细信息弹窗时间错误问题 2023-05-09 13:41:41 +08:00
fan
38e492bde7 宁波一列车车次窗操作调整 2023-05-09 13:37:51 +08:00
dong
7f63638c0e 修改实训报错问题 2023-05-09 09:47:28 +08:00
fan
623f8968b7 ncc比例参数调整 2023-05-09 09:35:58 +08:00
Yuan
7ff9a044b8 bugfix - 试卷规则标签选项
(cherry picked from commit e3857a75d0)
2023-05-09 09:15:53 +08:00
dong
e66295f016 调整已加入仿真提示功能 2023-05-09 09:13:47 +08:00
dong
cda47e5b64 Squashed commit of the following:
commit 4af4e7ea9c440cdf1a7dba0f6ed6b4774910b2ee
Author: dong <58670809@qq.com>
Date:   Sat May 6 18:11:16 2023 +0800

    登录时判断用户已经加入的仿真
2023-05-09 09:13:43 +08:00
dong
06cab3d7fe 切换考试时实训模式弹窗关闭
(cherry picked from commit d0a6b8e951)
2023-05-09 09:13:38 +08:00
dong
1afb68818f 实训标签只可添加,不能删除
(cherry picked from commit dd45877e1c)
2023-05-09 09:13:31 +08:00
Yuan
2e51c9ee4c bugfix - 查看规则时标签字段未填充 2023-05-06 16:22:15 +08:00
joylink_zhaoerwei
1bca2be560 故障提示NCC 2023-05-06 15:38:28 +08:00
fan
073e8bfc63 考试提交接口新增参数 2023-05-06 10:47:09 +08:00
fan
00b4b533a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-05 16:54:19 +08:00
fan
7d0abef1e9 实训考试调整 2023-05-05 16:54:06 +08:00
dong
9776419202 修改实训标签添加权限判断 2023-05-05 16:35:05 +08:00
dong
9618acaa9d 实训管理添加修改实训标签功能 2023-05-05 16:04:02 +08:00
fan
eb579ee0a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-05 09:33:03 +08:00
fan
e68bf8b9f8 第三方登录增加组织选择 2023-05-05 09:32:34 +08:00
joylink_zhaoerwei
91b1e8f5b3 多故障展示初稿 2023-05-04 17:39:29 +08:00
fan
bbf9e9ba0e socket重复订阅问题修复 2023-05-04 17:23:51 +08:00
weizhihong
0395d6d470 【群组消息已读标识】 2023-05-04 11:22:27 +08:00
fan
be9d27d7a2 socket异常逻辑调整 2023-05-04 11:05:08 +08:00
dong
8ae41273d6 地图设计-客户端数据 2023-04-28 16:59:13 +08:00
joylink_zhaoerwei
6f8d198f4c 报警微调 2023-04-28 11:12:48 +08:00
fan
027f00da77 socket异常通知调整 2023-04-28 11:04:38 +08:00
fan
ce522b6570 增加列车接管 2023-04-28 11:04:26 +08:00
fan
e3e07dec1b socket错误通知 2023-04-28 09:48:59 +08:00
fan
00dbc6d288 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test1 2023-04-28 09:22:13 +08:00
fan
f5e1c370cc socket依赖调整 2023-04-28 09:21:59 +08:00
dong
eb4cd6ab4a 修改新会话实训问题 2023-04-27 15:40:04 +08:00
joylink_zhaoerwei
fefed61486 多故障备用 2023-04-27 14:09:06 +08:00
fan
fb6c187c21 第三方登录页项目配置调整 2023-04-27 13:21:50 +08:00
fan
fc64ef5f19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-27 09:23:35 +08:00
fan
964ca665a4 线路数据设置归属项目管理项目数据通过接口查询 2023-04-27 09:23:21 +08:00
joylink_zhaoerwei
d73dea42ec 故障报警优化 2023-04-26 15:02:21 +08:00
joylink_zhaoerwei
071bfa90f7 故障报警初提交备用,待优化 2023-04-25 18:08:29 +08:00
dong
20de76047b 修改语音最长秒数 2023-04-25 17:41:08 +08:00
fan
cc3003dbb0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 17:39:34 +08:00
fan
a79668095c ncc逻辑调整 2023-04-25 17:39:24 +08:00
dong
7c46ad5c62 获取project为null时无法找到页面问题 2023-04-25 16:22:30 +08:00
dong
2d15eee9f8 会话群代码调整 2023-04-25 15:56:18 +08:00
dong
0805383fde 群消息已读 2023-04-25 15:19:30 +08:00
fan
034199ec23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 13:56:24 +08:00
fan
1faf4fadc5 ncc客户端调整 2023-04-25 13:56:09 +08:00
dong
fcae8539d9 NCC行调名称调整成NCC调度 2023-04-25 10:25:56 +08:00
fan
a188121aac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 09:42:48 +08:00
fan
7e8fb7cbd1 ncc列车颜色调整 2023-04-25 09:42:28 +08:00