Commit Graph

12937 Commits

Author SHA1 Message Date
fan
dea3207c22 删除日志 2023-05-20 17:59:37 +08:00
fan
6bc46647d7 删除日志 2023-05-20 17:50:32 +08:00
fan
f5a2ca8eaf 考试规则问题调整 2023-05-20 16:39:05 +08:00
fan
27a88795f7 考试时不显示实训模式 2023-05-20 16:12:13 +08:00
fan
516a3a4041 试卷考试添加倒计时,倒计时结束提交试卷&试卷规则调整 2023-05-20 16:10:54 +08:00
fan
2d1558b011 实训客户端切换调整 2023-05-20 13:57:10 +08:00
fan
d5e515fbfa 删除日志 2023-05-20 13:36:18 +08:00
fan
47f55642e3 ncc报警客户端切换调整&角色变更客户端切换调整 2023-05-15 17:22:45 +08:00
fan
1bdc04fb8e 客户端生成问题调整 2023-05-15 16:41:33 +08:00
fan
25acb80335 socket提示调整 2023-05-15 16:41:15 +08:00
fan
87aeb03cb0 派班工作站客户端初始化异常调整 2023-05-15 14:05:01 +08:00
fan
ee04af801a 客户端调整 2023-05-15 13:24:50 +08:00
fan
89ab468d6b 注释部分无用代码 2023-05-15 11:02:30 +08:00
fan
ac9f364e39 模板线路功能注掉初始客户端 2023-05-15 10:28:08 +08:00
fan
4b3114c9b5 新窗口打开客户端跳转错误处理 2023-05-15 09:51:32 +08:00
fan
7aa44293f2 ncc客户端跳转调整 2023-05-12 16:30:13 +08:00
fan
0d323cac5f 教学管理图片更换 2023-05-12 16:29:51 +08:00
fan
38ee6fc4c6 初始无仿真角色且有初始客户端逻辑调整 2023-05-12 16:18:40 +08:00
fan
47d4af94ed 应急调度客户端逻辑生成调整&客户端切换调整 2023-05-12 15:57:40 +08:00
fan
c142102de1 Merge remote-tracking branch 'origin/test_client' into test 2023-05-12 13:55:06 +08:00
fan
9e8917ccc1 客户端调整 2023-05-12 13:48:18 +08:00
dong
80067ca6aa 新会话代码调整 2023-05-11 16:11:00 +08:00
fan
86eff63658 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-11 15:21:55 +08:00
fan
d13dc9696e 扬工院教学管理隐藏班级管理 2023-05-11 15:21:46 +08:00
fan
a4525be99e 客户端调整 2023-05-11 15:13:39 +08:00
dong
564ca5a845 地图设计-会话群调整 2023-05-11 15:03:57 +08:00
dong
9b07bfacea 修改ningbo01列车信息 2023-05-10 17:39:57 +08:00
dong
2cddeac881 添加ningbo01列车信息 2023-05-10 14:51:44 +08:00
dong
4f7b04fde5 实训开始清理之前的操作记录 2023-05-10 11:07:05 +08:00
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
fan
0f15e2d41f 模板线路功能调整 2023-05-09 10:37:07 +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
fan
1c51094308 生成客户端逻辑调整 2023-05-04 16:54:45 +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
dong
79fbb8d071 会话群代码调整 2023-04-24 18:27:36 +08:00
dong
6d848115b3 添加角色NCC行调 2023-04-24 16:10:50 +08:00
fan
5181b1e98a ncc显示配置 2023-04-24 15:43:04 +08:00
fan
68d0d9c83b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-24 14:33:33 +08:00
fan
e326a18d80 新增同站示意框 2023-04-24 14:32:40 +08:00
dong
775603368d Squashed commit of the following:
commit b5705b12c2
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 13:19:45 2023 +0800

    代码调整

commit 196f8e5306
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 10:42:18 2023 +0800

    线路设计-仿真成员-会话群名称显示调整

commit 4fe929cd37
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 16:24:52 2023 +0800

    代码调整

commit 7dd973c13e
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:58:34 2023 +0800

    会话群调整

commit 50e5e92a05
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:43:17 2023 +0800

    会话群调整

commit 740e676971
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 15:17:10 2023 +0800

    会话群调整

commit 6d4e28a0dc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 11:02:38 2023 +0800

    会话群调整

commit 2d2f3e9fdc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 10:12:14 2023 +0800

    会话群调整

commit 3b21f72e38
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 09:37:56 2023 +0800

    会话群调整

commit baaa8e4bbb
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 15:38:48 2023 +0800

    会话群调整

commit 53ef9b5930
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 11:16:18 2023 +0800

    群组信息接口

commit df2cae5c2b
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 10:57:56 2023 +0800

    Squashed commit of the following:

    commit d0722f229c376afa241441bc91d085f6c6f68d4e
    Author: dong <58670809@qq.com>
    Date:   Thu Apr 20 10:51:28 2023 +0800

        新会话群
2023-04-24 13:38:05 +08:00
fan
933ef9ed82 ncc代码调整4.24 2023-04-24 13:16:07 +08:00
fan
18f67436aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-23 18:15:36 +08:00
fan
42ef83d302 ncc代码调整4.23 2023-04-23 18:15:13 +08:00
fan
0cdaa7a6ed ncc代码调整 2023-04-21 17:46:58 +08:00
dong
d082dc2fbc 修改收令单位不显示调度命令问题 2023-04-19 10:41:17 +08:00
c52925960c Merge remote-tracking branch 'origin/test' into test 2023-04-18 16:25:03 +08:00
a3bc0de08a 处理列车异常显示问题 by fan 2023-04-18 16:24:34 +08:00
dong
1f5d891c55 修改苏电院交控线路顶部菜单展开后没法收回去问题 2023-04-17 14:40:39 +08:00
dong
0d50ac586b 修改弹窗没有高度问题 2023-04-17 13:26:39 +08:00
dong
73c9c0777e 去掉实训管理查询项缓存 2023-04-14 16:25:38 +08:00
fan
dff6b0f545 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-14 13:07:37 +08:00
fan
4285249458 教学管理实训数据管理调整 2023-04-14 13:07:17 +08:00
dong
d3dd38b883 宁波3排路进路校验字段调整 2023-04-13 18:25:18 +08:00