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 |
|
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 |
|
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
|
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 |
|
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 |
|
