Commit Graph

13801 Commits

Author SHA1 Message Date
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
503c4c4ed3 扬工院教学管理隐藏班级管理 2023-05-11 15:22:37 +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
fff07141b6 修改错误的冲突合并 2023-05-06 19:00:17 +08:00
80178a80f6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/jmapNew/painter.js
2023-05-06 18:37:26 +08:00
1d824c135e Merge remote-tracking branch 'origin/test_revert5.6' 2023-05-06 18:35:52 +08:00
Yuan
1318ecb97a Merge branch 'test_revert5.6' of git.code.tencent.com:lian-cbtc/jl-client into test_revert5.6 2023-05-06 18:03:37 +08:00
Yuan
e3857a75d0 bugfix - 试卷规则标签选项 2023-05-06 18:03:32 +08:00
joylink_zhaoerwei
f3ae97f7f8 故障提示NCC 2023-05-06 17:26:09 +08:00
Yuan
b472601fbc bugfix - 查看规则时标签字段未填充
(cherry picked from commit 2e51c9ee4c)
2023-05-06 16:31:37 +08:00
Yuan
2e51c9ee4c bugfix - 查看规则时标签字段未填充 2023-05-06 16:22:15 +08:00
dong
d0a6b8e951 切换考试时实训模式弹窗关闭 2023-05-06 16:17:38 +08:00
dong
dd45877e1c 实训标签只可添加,不能删除 2023-05-06 16:01:16 +08:00
joylink_zhaoerwei
1bca2be560 故障提示NCC 2023-05-06 15:38:28 +08:00
fan
b6edc4913b Revert "Squashed commit of the following:"
This reverts commit 77560336
2023-05-06 10:54:30 +08:00
fan
5c72107b90 Revert "添加角色NCC行调"
This reverts commit 6d848115b3.
2023-05-06 10:53:25 +08:00
fan
c4028ee8c6 Revert "会话群代码调整"
This reverts commit 79fbb8d071.
2023-05-06 10:53:15 +08:00
fan
a7b0609389 Revert "NCC行调名称调整成NCC调度"
This reverts commit fcae8539d9.
2023-05-06 10:53:02 +08:00
fan
204aef1583 Revert "群消息已读"
This reverts commit 0805383f
2023-05-06 10:52:15 +08:00
fan
c563fe8efa Revert "会话群代码调整"
This reverts commit 2d15eee9f8.
2023-05-06 10:49:24 +08:00
fan
1b1ddad29e Revert "修改语音最长秒数"
This reverts commit 20de76047b.
2023-05-06 10:49:05 +08:00
fan
7fa5b1d62e Revert "修改新会话实训问题"
This reverts commit eb4cd6ab4a.
2023-05-06 10:48:54 +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