|
|
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 |
|
dong
|
d0a6b8e951
|
切换考试时实训模式弹窗关闭
|
2023-05-06 16:17:38 +08:00 |
|
dong
|
dd45877e1c
|
实训标签只可添加，不能删除
|
2023-05-06 16:01:16 +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 |
|
dong
|
9618acaa9d
|
实训管理添加修改实训标签功能
|
2023-05-05 16:04:02 +08:00 |
|
fan
|
e353289594
|
第三方登录增加组织选择
|
2023-05-05 09:33:54 +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
|
210a7d0fdd
|
第三方登录页项目配置调整
|
2023-04-27 13:23:14 +08:00 |
|
fan
|
a373d21deb
|
线路数据设置归属项目管理项目数据通过接口查询
|
2023-04-27 13:23:07 +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 |
|
