Commit Graph

13347 Commits

Author SHA1 Message Date
fan
bf54424109 调度大赛控制权调整 2023-11-23 14:25:56 +08:00
Yuan
05788794cd bugfix - 信号机站控操作 2023-11-22 17:14:57 +08:00
Yuan
c6c3a3a377 bugfix - 站台扣车操作菜单 2023-11-22 14:47:50 +08:00
Yuan
e29028ec0e bugfix - 站控信号机操作 2023-11-22 14:17:48 +08:00
Yuan
c513a3e80b bugfix - ZCControl高亮问题 2023-11-22 14:11:17 +08:00
Yuan
9b2db3957e 站控允许信号机操作 2023-11-22 13:28:50 +08:00
Yuan
c2298f9995 站控允许排列进路 2023-11-22 11:31:17 +08:00
fan
74bfcf49f1 成都工学院添加双icon(调换透明icon) 2023-11-16 15:14:21 +08:00
fan
56eea551fb Merge remote-tracking branch 'origin/test' 2023-11-16 15:08:19 +08:00
fan
19fde5c7fc 成都工学院添加双icon 2023-11-16 15:07:43 +08:00
fan
8a3670f51d 国赛列车操作调整 2023-11-15 15:04:35 +08:00
fan
5aefd0dea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-13 17:24:46 +08:00
fan
af3b4b1d97 编辑设备配置NCC,OCC角色显示 2023-11-13 17:24:31 +08:00
Yuan
ad6d96890c tms页面放大 2023-11-13 10:38:30 +08:00
Yuan
8020075b98 tms页面微调 2023-11-10 17:22:37 +08:00
Yuan
dd4bbab000 tms 2023-11-10 10:55:42 +08:00
Yuan
907a88c6ea tms页面数据 2023-11-09 14:57:31 +08:00
fan
0b688dea64 tms客户端新增 2023-11-08 09:57:34 +08:00
Yuan
2bfdb557d1 tms页面 2023-11-07 17:24:15 +08:00
Yuan
f62f8ff273 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2023-11-03 17:37:57 +08:00
Yuan
ae9748a649 tms页面 2023-11-03 17:37:52 +08:00
fan
007548623d Revert "乘客信息发布系统拆分"
This reverts commit 4c67af284c.
2023-11-02 17:02:16 +08:00
fan
285b40091f 乘客信息发布系统拆分
(cherry picked from commit 4c67af284c)
2023-11-02 17:00:09 +08:00
fan
4c67af284c 乘客信息发布系统拆分 2023-11-02 16:59:37 +08:00
fan
684f32c481 Merge remote-tracking branch 'origin/test' 2023-10-31 17:51:57 +08:00
fan
597d4ea7d1 南京二ATP级别灯柱颜色修改&CR2操作完毕交互调整 2023-10-31 16:46:29 +08:00
fan
0867248df3 驾驶方式删除“无”&南京二增加NRM模式和停车 2023-10-30 17:13:35 +08:00
fan
313f716613 岔芯边缘道岔区段关联道岔导致报错调整 2023-10-30 16:26:58 +08:00
fan
c98c50f401 进路增加单列车进路属性&取消进路状态变化更新执行通知 2023-10-30 09:50:56 +08:00
fan
a5d260a340 加载备用车初始化调整 2023-10-26 16:23:33 +08:00
fan
4ba24892fc 南京二叶老师问题调整1 2023-10-26 15:40:25 +08:00
fan
1c76b26541 南京二叶老师问题调整 2023-10-26 13:10:49 +08:00
fan
2ef158851d Merge remote-tracking branch 'origin/test' 2023-10-25 14:05:58 +08:00
fan
e795ba1573 换端指令调整 2023-10-25 13:31:45 +08:00
fan
f9c47cbac6 Merge remote-tracking branch 'origin/test' 2023-10-25 10:36:11 +08:00
fan
efbd29a70a 南京二号线RM调整 2023-10-25 10:35:07 +08:00
fan
8fbddfe40d Merge remote-tracking branch 'origin/test' 2023-10-23 16:42:09 +08:00
fan
ca183eed7e 南京二号线哈尔滨线早晚点显示调整 2023-10-23 16:41:09 +08:00
fan
d9b03b30f6 仿真数据异常loading不关闭问题修复 2023-10-10 15:56:21 +08:00
910082305d Merge branch 'test'
# Conflicts:
#	src/views/newMap/display/terminals/index.vue
2023-09-27 18:11:19 +08:00
fan
16d9ee72bb 实训编制调整 2023-09-27 18:02:34 +08:00
fan
90d52176f2 添加仿真成员角色 2023-09-27 17:32:49 +08:00
fan
82e67c69e6 memberId丢失判定 2023-09-27 16:22:32 +08:00
fan
f01c445b25 实训问题修复
(cherry picked from commit 0598da9a2d)
2023-09-27 15:47:09 +08:00
fan
0598da9a2d 实训问题修复 2023-09-27 15:46:10 +08:00
fan
ac096dd663 Merge remote-tracking branch 'origin/test' 2023-09-20 14:51:28 +08:00
fan
fbdb48dc08 成都三号线现地仿真控制权切换问题调整 2023-09-20 14:51:03 +08:00
fan
2d7cdff431 错误数据跳过 2023-08-29 16:43:32 +08:00
fan
9b3cfdab78 运行图显示调整 2023-08-21 17:25:33 +08:00
fan
5efcec96ec bugfix:双击修改车次号 2023-08-18 13:50:35 +08:00
fan
2b035003e2 bugfix:打开运行图预览没有数据 2023-08-18 10:51:09 +08:00
fan
dd6f8bace4 列车操作速度显示调整 2023-08-17 13:21:53 +08:00
fan
cad848ce8e 自动运行 添加 2023-08-17 10:39:37 +08:00
fan
9bc7126509 登录路径处理调整 2023-08-16 17:50:39 +08:00
fan
b9830714c7 登录路径处理调整 2023-08-16 16:17:52 +08:00
fan
ae8c202dbe 南工院增加列车操作 2023-08-14 10:07:07 +08:00
fan
aea0436cbc 道岔生成逻辑调整 2023-08-09 17:05:03 +08:00
fan
acb8c3455f 车辆段放开故障操作 2023-07-28 11:11:06 +08:00
fan
52a5a78861 标准线调整 2023-07-13 10:46:07 +08:00
fan
e08677eabe 成员一键生成 2023-07-06 09:55:25 +08:00
fan
3dd44c3243 设备登录退出路径丢失调整 2023-07-05 10:56:02 +08:00
fan
ee58c53b83 Merge remote-tracking branch 'origin/test' 2023-06-12 10:13:52 +08:00
fan
0600abc0c9 实训室功能隐藏 2023-06-12 10:03:57 +08:00
fan
8e34a0f267 Merge remote-tracking branch 'origin/test' 2023-06-08 13:27:05 +08:00
fan
a8e2c9ef3b 注册找回账号手机号校验格式调整 2023-06-08 10:59:50 +08:00
fan
6b18628b7c Merge remote-tracking branch 'origin/test' 2023-06-07 18:01:28 +08:00
fan
d232546e8c 新增宁波一号线特殊线路 2023-06-07 09:38:15 +08:00
fan
f20378c4b4 福州一号线&宁波一号线新增列车连挂操作 2023-06-06 17:21:01 +08:00
fan
42779dc952 Merge remote-tracking branch 'origin/test' 2023-06-06 10:09:00 +08:00
fan
9aab60fe9c 区域选择未初始化控制人调整 2023-06-06 10:07:31 +08:00
fan
e1f35c56e9 项目配置添加删除logo功能 2023-06-06 09:53:50 +08:00
fan
92e3e5db31 福州一号线道岔失表调整 2023-06-05 14:23:07 +08:00
fan
228b4aadc3 列车操作调整 2023-06-02 17:32:58 +08:00
fan
0df4ffdcf6 登录调整 2023-06-02 16:54:05 +08:00
fan
b1c0ef11a8 设备登录配置调整&列车操作列车图标反转调整 2023-06-02 14:21:29 +08:00
fan
3855087abd Merge remote-tracking branch 'origin/test' 2023-06-01 18:15:18 +08:00
fan
928b380811 大铁线路二注释新建计划车&新增故障操作添加备用车 2023-06-01 15:43:46 +08:00
fan
06ec5fe8e1 项目登录客户端选择调整 2023-06-01 10:21:24 +08:00
fan
0f22d3c818 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-06-01 09:40:58 +08:00
fan
4471a3000c 设备登录query错误数据调整 2023-06-01 09:39:43 +08:00
dong
50cf3a826d 薄册输入时间日期实训调整 2023-05-31 17:39:02 +08:00
dong
61915cd583 实训编制时添加跳转到当前步骤功能 2023-05-31 14:22:05 +08:00
dong
252d3d69e4 会话群创建添加实训操作 2023-05-31 14:01:25 +08:00
fan
5ad0421991 增加错误日志 2023-05-31 10:24:16 +08:00
fan
228044b4c9 多人实训调整 2023-05-31 09:46:54 +08:00
fan
ca329a4db7 Merge remote-tracking branch 'origin/test' 2023-05-30 17:55:25 +08:00
fan
f13252ff27 34234124 2023-05-30 17:54:40 +08:00
fan
b863211cca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 17:07:59 +08:00
fan
06c6cb26c6 应急调度按钮调整 2023-05-30 17:07:33 +08:00
fan
ad105021fd v-if=>v-show防止单客户端未切换错误 2023-05-30 16:52:52 +08:00
dong
b85f8a5011 IBP盘计轴预复位鼠标左键接口迟滞,保证实训操作顺序 2023-05-30 16:31:03 +08:00
fan
88d09f2645 设置限速灰显判断调整 2023-05-30 16:00:04 +08:00
fan
62e2c3978f 添加赛的专用配置 2023-05-30 15:41:07 +08:00
fan
d4f919b54a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 11:25:02 +08:00
fan
268febaf7f 宁波一号线道岔钩锁=》手摇道岔钩锁 2023-05-30 11:24:35 +08:00
fan
57f65d45e3 添加草稿ibp管理 2023-05-30 11:23:52 +08:00
dong
8449d731bd 新会话调整 2023-05-30 10:58:36 +08:00
fan
ac3457efbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 10:21:21 +08:00
fan
b2ce52612f 宁波一密码添加提示 2023-05-30 10:20:36 +08:00
fan
177bb78883 宁波一号线计轴复位区段筛选调整&车站字体大小判断调整&注释宁波一号线车站上电解锁 2023-05-30 09:50:51 +08:00
dong
9d193dcd66 实训的导入和导出 2023-05-29 18:42:34 +08:00
fan
80007a7521 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-29 16:28:14 +08:00
fan
a5849d9dd1 宁波一号线连锁故障,上电解锁功能增加 2023-05-29 16:27:56 +08:00
dong
a54a4d0d3c 打开聊天弹窗去掉实训校验 2023-05-29 13:57:05 +08:00
dong
77f644fc28 代码调整 2023-05-29 10:58:53 +08:00
dong
ef3c56b696 仿真角色调整 2023-05-29 10:49:59 +08:00
fan
a519447c62 获取个人信息接口更换 2023-05-29 10:32:48 +08:00
fan
94fa725cc7 标准线福州一新增连锁故障&上电解锁 2023-05-29 10:24:49 +08:00
fan
e32d8f9b6b Merge remote-tracking branch 'origin/test' 2023-05-26 17:59:19 +08:00
fan
7ebc8dbf1e 第三方登录新窗口打开 2023-05-26 17:58:52 +08:00
fan
23975cd271 Merge remote-tracking branch 'origin/test' 2023-05-26 17:43:20 +08:00
fan
adf75ebc1a 继续仿真获取project错误 2023-05-26 17:42:54 +08:00
fan
f4e27a6e31 Merge remote-tracking branch 'origin/test' 2023-05-26 17:18:59 +08:00
fan
3d63abcdbd 第三方登录还原项目判断 2023-05-26 17:18:40 +08:00
fan
4424137da9 Merge remote-tracking branch 'origin/test' 2023-05-26 15:56:44 +08:00
fan
18b5780415 实训预览不在前端切换成员 2023-05-26 15:56:22 +08:00
fan
ac82fad041 Merge remote-tracking branch 'origin/test' 2023-05-26 15:34:23 +08:00
fan
edcdd8989f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-26 15:32:54 +08:00
fan
688c7c3315 版权展示调整 2023-05-26 15:31:11 +08:00
dong
501dd0b181 新会话调整 2023-05-26 13:50:52 +08:00
fan
6fd27205fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-26 09:48:50 +08:00
fan
2bd6088bd3 运行图编辑一直加载问题调整 2023-05-26 09:48:23 +08:00
dong
6d18d374a4 新会话调整 2023-05-25 15:09:02 +08:00
dong
94c8f30305 修改仿真重新进入后之前的角色没有清除 2023-05-25 14:23:56 +08:00
dong
8151a465ab 新会话在初始化后重新获取会话列表 2023-05-25 13:46:01 +08:00
dong
13b63988dd 仿真成员界面样式优化 2023-05-25 10:31:57 +08:00
fd5af534af Merge remote-tracking branch 'origin/test' 2023-05-24 19:19:48 +08:00
dong
9426ece04f 仿真角色统一 2023-05-24 18:34:38 +08:00
joylink_zhaoerwei
8256758a7a 微调--NCC消息判断 2023-05-24 18:21:49 +08:00
joylink_zhaoerwei
dd4f2a2fe6 微调 2023-05-24 17:46:01 +08:00
joylink_zhaoerwei
9cde1a5487 微调 2023-05-24 17:28:03 +08:00
joylink_zhaoerwei
82359d5a4c 微调 2023-05-24 17:04:45 +08:00
c90da32501 Merge remote-tracking branch 'origin/test' into test 2023-05-24 17:00:41 +08:00
f85fba0b5d 处理仿真销毁后创建者没有退出页面问题 -by fan 2023-05-24 17:00:27 +08:00
joylink_zhaoerwei
5874e8d81f 微调 2023-05-24 15:44:05 +08:00
joylink_zhaoerwei
82b4d671b2 告警分页 2023-05-24 15:15:35 +08:00
fan
79b8d24c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 14:25:53 +08:00
fan
e29700534a 派班工作站获取列车调整 2023-05-24 14:25:22 +08:00
joylink_zhaoerwei
1c31517588 微调 2023-05-24 14:00:51 +08:00
joylink_zhaoerwei
aa1e6ca4c7 微调 2023-05-24 13:56:43 +08:00
joylink_zhaoerwei
4e2a36bcb8 去分组 2023-05-24 13:52:07 +08:00
joylink_zhaoerwei
01471bba12 故障报警初提交 2023-05-24 11:25:54 +08:00
fan
fa6883fe8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 11:13:19 +08:00
fan
bab7cd6c40 注释调整 2023-05-24 11:12:59 +08:00
fan
43db0d138f 项目配置完善全部迁移为配置项 2023-05-24 11:04:39 +08:00
dong
404d028585 新会话调整 2023-05-24 10:55:27 +08:00
dong
248f2a767a 新会话调整 2023-05-23 18:11:28 +08:00
dong
6c8ae4f763 角色信息调度名称修改 2023-05-23 17:38:23 +08:00
fan
341e0ff829 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 16:59:59 +08:00
fan
ca4c184e14 实训设计限制新标签页打开客户端 2023-05-23 16:59:43 +08:00
dong
f1a7f09cc7 添加角色OCC_DISPATCHER信息调度 2023-05-23 16:42:31 +08:00
dong
ac1ef8e5a8 线路数据管理-生成实训 2023-05-23 15:54:33 +08:00
fan
88b9ac889c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 15:50:56 +08:00
fan
9acd8a8eba 生成客户端调整+覆盖生成快捷方式 2023-05-23 15:50:40 +08:00
dong
fa906225a7 新会话调整 2023-05-23 15:02:26 +08:00
dong
642a09f80c 新会话优化调整 2023-05-23 14:13:02 +08:00
fan
21774b94a3 客户端跳转判断调整 2023-05-23 13:27:41 +08:00
fan
94a3693337 仿真状态判断调整 2023-05-23 11:27:36 +08:00
joylink_zhaoerwei
228c06e61d 微调 2023-05-22 17:55:41 +08:00
fan
1501a75ad3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 17:16:53 +08:00
fan
fb351cd75d 新增推出仿真成员处理 2023-05-22 17:16:38 +08:00
joylink_zhaoerwei
4449a25c5b 去除警告计数 2023-05-22 16:47:09 +08:00
dong
1ee0cad514 新会话调整 2023-05-22 16:43:49 +08:00
dong
0a2cdb3257 新会话调整 2023-05-22 16:35:20 +08:00
fan
83ee31034b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 16:07:08 +08:00
fan
ae3c2ea269 统计信息单位调整 2023-05-22 16:06:34 +08:00
dong
fe6a835873 新会话调整 2023-05-22 15:51:56 +08:00
dong
ae4e6b652c 私聊实训功能 2023-05-22 14:41:35 +08:00
fan
e30494d404 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 13:47:32 +08:00
fan
545440b7e7 统计信息调整 2023-05-22 13:47:09 +08:00
fan
06e4bb93c7 Revert "Revert "修改新会话实训问题""
This reverts commit 7fa5b1d62e.
2023-05-22 11:18:37 +08:00
fan
8a966ac5ae Revert "Revert "群消息已读""
This reverts commit 204aef15
2023-05-22 11:18:16 +08:00
fan
5eb2a3f80c Revert "Revert "NCC行调名称调整成NCC调度""
This reverts commit a7b0609389.
2023-05-22 11:18:02 +08:00
fan
e1bf3dbcea Revert "Revert "添加角色NCC行调""
This reverts commit 5c72107b
2023-05-22 11:16:59 +08:00
fan
67ea7ef5ae Revert "Revert "Squashed commit of the following:""
This reverts commit b6edc491
2023-05-22 11:16:27 +08:00
dong
77a80c2b2d 群邀请成员功能 2023-05-22 11:02:36 +08:00
dong
2635ea8c57 修改群主功能 2023-05-22 10:08:13 +08:00
dong
e6b1d2777a 添加私聊及成员查看 2023-05-22 09:43:36 +08:00
fan
144fecf31a 删除日志 2023-05-21 16:31:04 +08:00
fan
240f779afb 站遥控初始值调整 2023-05-21 16:30:43 +08:00
fan
c23bf6ba72 仿真倍速同步 2023-05-21 13:54:49 +08:00
fan
5e55daf3a4 北京佛山线路现地工作站操作新增控制器判断 2023-05-21 13:40:14 +08:00
fan
3fc6f13c6a Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/store/modules/map.js
#	src/views/newMap/display/index.vue
#	src/views/newMap/display/newChat/chatContent.vue
#	src/views/newMap/display/newChat/chatDialog.vue
#	src/views/newMap/display/newChat/editGroup.vue
#	src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
#	src/views/organization/index.vue
#	src/views/publish/examRule/draft/editRule.vue
2023-05-20 18:13:52 +08:00
fan
bc6ad0226b 会话使用旧组件 2023-05-20 18:04:58 +08:00
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
dongq107
ce62a19aa0 到第三方登录页面时先删除之前的token 2023-05-18 15:12:31 +08:00
dongq107
d09e415720 第三方登录必需调接口 2023-05-18 14:12:51 +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
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