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 |
|
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
|
f2039927db
|
Squashed commit of the following:
commit d082dc2fbc
Author: dong <58670809@qq.com>
Date: Wed Apr 19 10:41:17 2023 +0800
修改收令单位不显示调度命令问题
commit c52925960c
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:25:03 2023 +0800
Merge remote-tracking branch 'origin/test' into test
commit a3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com>
Date: Tue Apr 18 16:24:34 2023 +0800
处理列车异常显示问题 by fan
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
|
2023-04-19 10:42:38 +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
|
c020d69150
|
Squashed commit of the following:
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date: Mon Apr 17 14:40:39 2023 +0800
修改苏电院交控线路顶部菜单展开后没法收回去问题
|
2023-04-17 14:51:08 +08:00 |
|
dong
|
1f5d891c55
|
修改苏电院交控线路顶部菜单展开后没法收回去问题
|
2023-04-17 14:40:39 +08:00 |
|
dong
|
f27fd63e29
|
Squashed commit of the following:
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date: Mon Apr 17 13:26:39 2023 +0800
修改弹窗没有高度问题
|
2023-04-17 13:28:06 +08:00 |
|
dong
|
0d50ac586b
|
修改弹窗没有高度问题
|
2023-04-17 13:26:39 +08:00 |
|
dong
|
857472ba72
|
Squashed commit of the following:
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date: Fri Apr 14 16:25:38 2023 +0800
去掉实训管理查询项缓存
|
2023-04-14 16:26:57 +08:00 |
|
dong
|
73c9c0777e
|
去掉实训管理查询项缓存
|
2023-04-14 16:25:38 +08:00 |
|
fan
|
1aca150711
|
Merge remote-tracking branch 'origin/test'
|
2023-04-14 13:09: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 |
|
fan
|
8593174685
|
Merge remote-tracking branch 'origin/test'
|
2023-04-13 16:23:01 +08:00 |
|
fan
|
0e1dcbb5fd
|
刷新页面baseUrl调用错误调整
|
2023-04-13 16:04:14 +08:00 |
|
fan
|
f5ffa562ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-13 14:22:55 +08:00 |
|
fan
|
0438f6b183
|
哈尔滨南京二号线样式调整
|
2023-04-13 14:22:45 +08:00 |
|
dong
|
482d8ba2bf
|
事件总线订阅未销毁导致的重复调用问题
|
2023-04-13 13:29:56 +08:00 |
|
fan
|
47bae5b02c
|
PSL不显示小型站台
|
2023-04-13 10:16:49 +08:00 |
|
fan
|
0626d81356
|
非实训设计司机角色跳转司机驾驶客户端
|
2023-04-13 10:05:11 +08:00 |
|
fan
|
9ea5bef12a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2023-04-13 09:35:03 +08:00 |
|
fan
|
3ecf5e4da3
|
增加综合演练仿真号复制
|
2023-04-13 09:34:42 +08:00 |
|
dong
|
2bb8c6df92
|
Squashed commit of the following:
commit 30763300ac
Author: dong <58670809@qq.com>
Date: Wed Apr 12 18:31:39 2023 +0800
修改前端配置带id
commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 18:07:47 2023 +0800
宁波三进路选择表示样式不取消
commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 17:58:11 2023 +0800
区域选择界面调整
commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date: Wed Apr 12 13:33:03 2023 +0800
系统管理-教学考试数据管理
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
|
2023-04-12 18:34:06 +08:00 |
|
dong
|
30763300ac
|
修改前端配置带id
|
2023-04-12 18:31:39 +08:00 |
|
fan
|
cde33feb22
|
宁波三进路选择表示样式不取消
|
2023-04-12 18:07:47 +08:00 |
|
fan
|
34a94e2c6d
|
区域选择界面调整
|
2023-04-12 17:58:11 +08:00 |
|
fan
|
52af1d994b
|
系统管理-教学考试数据管理
|
2023-04-12 13:33:03 +08:00 |
|
dong
|
54fb5eb47a
|
Squashed commit of the following:
commit 6187b449c1
Author: dong <58670809@qq.com>
Date: Fri Apr 7 15:22:33 2023 +0800
代码调整
commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date: Fri Mar 31 16:52:08 2023 +0800
【删除注释】
|
2023-04-07 15:27:22 +08:00 |
|
dong
|
6187b449c1
|
代码调整
|
2023-04-07 15:22:33 +08:00 |
|
fan
|
95b6d019dd
|
Merge remote-tracking branch 'origin/test'
|
2023-04-06 17:32:19 +08:00 |
|
weizhihong
|
074453ece7
|
【删除注释】
|
2023-03-31 16:52:08 +08:00 |
|
fan
|
2b6fa6a9f7
|
综合演练生成仿真号&仿真界面刷新bug调整
|
2023-03-31 15:54:37 +08:00 |
|
fan
|
ed1c4c0e53
|
Merge remote-tracking branch 'origin/test'
|
2023-03-23 17:51:52 +08:00 |
|
dong
|
770de3c73c
|
规则重复添加提示
|
2023-03-23 17:41:06 +08:00 |
|
dong
|
a67a736ec3
|
Squashed commit of the following:
commit e3d8637ffe
Author: dong <58670809@qq.com>
Date: Thu Mar 23 10:09:03 2023 +0800
跳转登录时先登入组织再获取用户信息
|
2023-03-23 10:11:20 +08:00 |
|
fan
|
449800f360
|
线路功能样式微调
|
2023-03-13 16:26:18 +08:00 |
|
fan
|
6fd16fcc95
|
三方跳转调整
|
2023-03-13 15:23:19 +08:00 |
|
fan
|
5af47f6ac4
|
设备登录loading调整
|
2023-03-13 15:21:59 +08:00 |
|
fan
|
4150f64f36
|
三方跳转调整
|
2023-03-13 15:01:59 +08:00 |
|
fan
|
4ffdc6a90d
|
缓存project调整
|
2023-03-13 13:24:24 +08:00 |
|
fan
|
191542d0d4
|
项目配置调整
|
2023-03-13 11:01:33 +08:00 |
|
fan
|
8ec88a84a2
|
Merge remote-tracking branch 'origin/test'
|
2023-03-10 09:37:53 +08:00 |
|
fan
|
4aa0474586
|
恢复正式接口调用判断
|
2023-03-09 10:20:56 +08:00 |
|
fan
|
aa4ab3ce91
|
撤销token存在local
|
2023-03-07 14:26:02 +08:00 |
|
fan
|
e5046f3fa8
|
注释自动登录
|
2023-03-07 13:56:09 +08:00 |
|
fan
|
b42c8ea6b5
|
查询项目设备调整
|
2023-03-06 16:31:41 +08:00 |
|
fan
|
0339b04966
|
授权码管理&申请
|
2023-03-02 16:39:44 +08:00 |
|
fan
|
5c0c9c7702
|
授权码显示页面调整
|
2023-03-02 16:23:49 +08:00 |
|
fan
|
71502ba211
|
路由跳转调整
|
2023-03-02 16:11:27 +08:00 |
|
fan
|
8a89c93603
|
获取项目配置接口频繁调用调整
|
2023-03-02 14:31:53 +08:00 |
|
fan
|
8e7b653bd3
|
设备管理配置调整
|
2023-03-01 15:53:20 +08:00 |
|
fan
|
8c5f4b3cdf
|
设备管理配置调整
|
2023-03-01 15:51:05 +08:00 |
|
fan
|
a7f55fd52c
|
token清除位置调整
|
2023-02-27 13:46:29 +08:00 |
|
fan
|
d1133c947c
|
自动登录调整
|
2023-02-27 13:41:08 +08:00 |
|
fan
|
d9b6b3fb2c
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-24 13:28:27 +08:00 |
|
fan
|
2aadaaf100
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-24 13:06:38 +08:00 |
|
dong
|
87a603e52d
|
区段右键添加分路不良功能
|
2023-02-24 10:29:06 +08:00 |
|
fan
|
f24c36dbed
|
鉴权调整
|
2023-02-23 18:18:01 +08:00 |
|
fan
|
be047fff67
|
组织管理添加人员操作方式调整
|
2023-02-22 17:49:12 +08:00 |
|
fan
|
014c743a10
|
模板线路功能&线路功能里新增分组
|
2023-02-21 17:11:28 +08:00 |
|
fan
|
f5b0fcb452
|
仿真页面调整2
|
2023-02-21 16:43:59 +08:00 |
|
fan
|
fea4cf4fe2
|
线路功能上传图片命名添加随机数
|
2023-02-21 11:30:17 +08:00 |
|
fan
|
224105fb16
|
仿真页面样式调整1
|
2023-02-21 11:22:52 +08:00 |
|
fan
|
5c43facb36
|
仿真页面样式调整
|
2023-02-21 11:18:59 +08:00 |
|
fan
|
582cc02722
|
一键生成form注释调整
|
2023-02-21 10:58:18 +08:00 |
|
fan
|
e0649fd4c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-21 10:56:48 +08:00 |
|
fan
|
80bb63a4a2
|
线路功能上传图片命名调整
|
2023-02-21 10:56:38 +08:00 |
|
dong
|
abfda9a3e7
|
登录页英文显示
|
2023-02-20 16:52:36 +08:00 |
|
dong
|
275e39b42b
|
修改配置项目客户端登陆报错问题
|
2023-02-20 16:17:24 +08:00 |
|
fan
|
9a04a38ac4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-20 16:12:32 +08:00 |
|
fan
|
7590552db2
|
模板线路功能调整
|
2023-02-20 16:12:18 +08:00 |
|
dong
|
a7616055dc
|
修改从车务终端切到联锁界面后无法操作增加列车问题
|
2023-02-20 15:01:22 +08:00 |
|
dong
|
cf5e633187
|
代码调整
|
2023-02-20 14:19:12 +08:00 |
|
fan
|
710dd576d4
|
Merge remote-tracking branch 'origin/test'
|
2023-02-18 12:21:53 +08:00 |
|
fan
|
dd0fd19720
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-18 12:21:23 +08:00 |
|
fan
|
640b609831
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-18 12:18:25 +08:00 |
|
fan
|
de7623b475
|
发布报错调整
|
2023-02-18 12:18:09 +08:00 |
|
fan
|
3e3d3622dc
|
Merge remote-tracking branch 'origin/test'
|
2023-02-17 18:17:00 +08:00 |
|
dong
|
35cd45786f
|
代码调整
|
2023-02-17 18:15:55 +08:00 |
|
fan
|
85ca94a66a
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-17 18:15:07 +08:00 |
|
dong
|
960e16dfa2
|
代码调整
|
2023-02-17 18:05:16 +08:00 |
|
dong
|
8b38960f14
|
代码调整
|
2023-02-17 17:58:59 +08:00 |
|
fan
|
d4ce77e8bc
|
撤销:重复修改 权限分发到指定用户页面
|
2023-02-17 16:37:20 +08:00 |
|
fan
|
b07d540134
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 16:18:08 +08:00 |
|
fan
|
6ae073a557
|
调整:权限分发到指定用户添加账户查询条件
|
2023-02-17 16:18:00 +08:00 |
|
dong
|
4005b3783d
|
修改权限分发到指定用户弹窗和账号管理界面一致
|
2023-02-17 16:14:25 +08:00 |
|
fan
|
fd87f62c25
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 15:59:50 +08:00 |
|
fan
|
39f2019251
|
调整:仿真退出未重置activeTrainList
|
2023-02-17 15:59:40 +08:00 |
|
dong
|
25fcd0d671
|
代码调整
|
2023-02-17 15:49:44 +08:00 |
|
dong
|
fcb9ce5e08
|
模式转换功能调整
|
2023-02-17 15:01:59 +08:00 |
|
dong
|
2c41be9df5
|
代码调整
|
2023-02-17 11:23:02 +08:00 |
|
fan
|
7cfa33ecc0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 10:36:53 +08:00 |
|
fan
|
73514ebc1f
|
Bug:参演角色重复问题修复
|
2023-02-17 10:36:22 +08:00 |
|
dong
|
abdfcaef41
|
调整模式转换
|
2023-02-17 09:51:09 +08:00 |
|
fan
|
f38fb8891a
|
调整:驾驶至目的地添加清除操作
|
2023-02-16 17:28:17 +08:00 |
|
fan
|
0c6ef6e834
|
调整:删除触发故障操作
|
2023-02-16 17:27:01 +08:00 |
|
fan
|
fc36b56ef7
|
调整:实训增加立即执行操作(判断逻辑调整)
|
2023-02-16 14:02:27 +08:00 |
|
fan
|
90c74ee23c
|
调整:实训增加立即执行操作
|
2023-02-16 13:17:25 +08:00 |
|
fan
|
3dc5c22bf0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-16 10:36:46 +08:00 |
|
fan
|
9e066023e7
|
调整:场景实训参演角色可编辑
|
2023-02-16 10:36:34 +08:00 |
|
dong
|
cdd5b07d9b
|
代码调整
|
2023-02-16 10:05:48 +08:00 |
|
joylink_cuiweidong
|
be3ca9fbf4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
|
2023-02-15 18:26:50 +08:00 |
|
joylink_cuiweidong
|
2d8d1d3c11
|
代码调整
|
2023-02-15 18:25:09 +08:00 |
|
fan
|
00a1137a9a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-15 16:38:15 +08:00 |
|
fan
|
57bb7acc60
|
线路功能增加背景图片
|
2023-02-15 16:38:00 +08:00 |
|
dong
|
97c5ebfcaf
|
代码调整
|
2023-02-15 15:43:45 +08:00 |
|
dong
|
baa1df1bbb
|
添加状态选择
|
2023-02-15 15:32:42 +08:00 |
|
fan
|
1d428805f3
|
泰国项目新增列车沙盘控制
|
2023-02-15 11:08:49 +08:00 |
|
fan
|
ab6c05b03e
|
调整:考试实训已做题目 区别显示
|
2023-02-15 10:36:39 +08:00 |
|
fan
|
9dc9be66f7
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-14 17:32:15 +08:00 |
|
fan
|
f6040af47b
|
应急调度指挥项目列车计算位置调整
|
2023-02-14 17:31:53 +08:00 |
|
joylink_cuiweidong
|
90e0084247
|
代码调整
|
2023-02-14 17:09:17 +08:00 |
|
fan
|
c44983c4a5
|
BUG:会话框滚动条计算调整
|
2023-02-14 15:23:10 +08:00 |
|
fan
|
b02267b9c7
|
代码删除
|
2023-02-14 14:55:55 +08:00 |
|
fan
|
01aebf47f3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-14 14:48:25 +08:00 |
|
fan
|
bcec47c0c6
|
大铁CTC点击已办理引导总锁按钮执行取消引导总锁
|
2023-02-14 14:48:04 +08:00 |
|
joylink_cuiweidong
|
7c0508048a
|
大铁线路 分路不良 输入密码操作 代码调整
|
2023-02-13 17:54:48 +08:00 |
|
joylink_cuiweidong
|
b483d739cb
|
代码调整
|
2023-02-13 16:12:45 +08:00 |
|
joylink_cuiweidong
|
bd3352cd8b
|
代码调整
|
2023-02-13 16:07:31 +08:00 |
|
joylink_cuiweidong
|
7fd32ec138
|
代码调整
|
2023-02-13 16:00:01 +08:00 |
|
joylink_cuiweidong
|
ffbc056569
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-13 15:56:59 +08:00 |
|
joylink_cuiweidong
|
bd43b7c511
|
代码调整
|
2023-02-13 15:54:45 +08:00 |
|
fan
|
a91188d655
|
BUG:应急调度指挥列车缩放调整
|
2023-02-13 15:36:45 +08:00 |
|
fan
|
5c53092511
|
调整:实训步骤记录增加数据校验
|
2023-02-13 15:18:37 +08:00 |
|
fan
|
176068f6c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-13 14:34:53 +08:00 |
|
fan
|
e76dd0777a
|
BUG:【考试】场景实训做了一步后点击结束,再交卷,没有分数,并且这道题显示未做状态
|
2023-02-13 14:34:38 +08:00 |
|
dong
|
e7c7e23602
|
代码调整
|
2023-02-13 14:16:20 +08:00 |
|
fan
|
f4180c579c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-13 14:09:04 +08:00 |
|
fan
|
5452d49b05
|
调整:联动道岔判断增加限制条件
|
2023-02-13 14:08:46 +08:00 |
|
dong
|
8a8e47e1eb
|
薄册代码调整
|
2023-02-13 13:45:28 +08:00 |
|
joylink_cuiweidong
|
ab2a68865d
|
司机 ATS客户端 添加列车指令
|
2023-02-13 11:32:00 +08:00 |
|
fan
|
8d6b60ba5d
|
BUG:考试加载实训区分场景实训处理
|
2023-02-13 11:28:38 +08:00 |
|
|
57d5bb0674
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-13 10:59:06 +08:00 |
|
joylink_cuiweidong
|
27a99a7013
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-13 10:58:50 +08:00 |
|
joylink_cuiweidong
|
595dcf0374
|
大铁线路 分路不良 输入密码操作
|
2023-02-13 10:58:33 +08:00 |
|
fan
|
296594bc8e
|
调整:校验实训联动道岔判断调整
|
2023-02-10 17:09:40 +08:00 |
|
fan
|
09f27b7bfa
|
调整:实训记录提交过滤非本人步骤
|
2023-02-10 16:07:35 +08:00 |
|
fan
|
f1cbec026e
|
调整:考试规则场景实训扮演角色显示调整
|
2023-02-10 15:19:22 +08:00 |
|
fan
|
66f51b024f
|
调整:引导总锁鼠标移除样式调整
|
2023-02-10 15:04:50 +08:00 |
|
fan
|
707702d231
|
试卷规则扮演角色disabled调整
|
2023-02-10 14:13:49 +08:00 |
|
fan
|
60d1868850
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-10 13:41:20 +08:00 |
|
fan
|
be8154db27
|
BUG: 【考试管理】试卷定义时,选择场景实训需要改成不随机出题,直接展示该线路下所有场景以供选择,并在此可以定义场景的角色(只能选一个),考试时用户不需要选择角色,直接开始考试
|
2023-02-10 13:41:04 +08:00 |
|
joylink_cuiweidong
|
c071b6a98d
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-10 11:09:26 +08:00 |
|
joylink_cuiweidong
|
7a04b580b8
|
添加 电力工务 角色
|
2023-02-10 11:09:10 +08:00 |
|
dong
|
36b4d0382a
|
处理大铁CTC仿真成员删除无反应问题
|
2023-02-10 10:13:08 +08:00 |
|
fan
|
80687fd3f0
|
BUG: 如果是文本会话消息没有audioPath时跳过自动播放
|
2023-02-10 10:04:05 +08:00 |
|
fan
|
4323ed274e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-10 09:42:11 +08:00 |
|
dong
|
7e7bb8ded9
|
添加学生时增加手机号参数
|
2023-02-09 18:36:15 +08:00 |
|
joylink_cuiweidong
|
bfd75b723b
|
代码调整
|
2023-02-09 18:11:52 +08:00 |
|
joylink_cuiweidong
|
fded75dd85
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-09 18:09:26 +08:00 |
|
joylink_cuiweidong
|
ac8ab5a6cc
|
司机添加ATS客户端
|
2023-02-09 18:09:11 +08:00 |
|
dong
|
22e9d81183
|
取消场景定位
|
2023-02-09 16:16:03 +08:00 |
|
dong
|
ef55fb847d
|
代码调整
|
2023-02-09 15:03:08 +08:00 |
|
fan
|
ba0007807b
|
调整:考试试题提交接口参数调整
|
2023-02-09 14:59:45 +08:00 |
|
dong
|
85bc2e7fd1
|
代码调整
|
2023-02-09 11:46:37 +08:00 |
|
fan
|
51b85082dd
|
调整:簿册查询不录制操作
|
2023-02-09 11:03:34 +08:00 |
|
fan
|
9ef0780377
|
优化:实训评分规则总分自动统计
|
2023-02-09 10:34:04 +08:00 |
|
fan
|
7fc9e0fab4
|
优化:实训评分规则提示脱离文本
|
2023-02-09 10:14:56 +08:00 |
|
fan
|
ac05654672
|
BUG:实训未结束时点击了理论题,然后再点击实训题无法打开实训组件
|
2023-02-09 09:40:18 +08:00 |
|
fan
|
eb17b90d82
|
仿真=》权限 去除剩余数量一栏
|
2023-02-09 09:34:46 +08:00 |
|
fan
|
eb8bc61b90
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-09 09:28:46 +08:00 |
|
fan
|
06214aa258
|
大铁CTC引导总锁
|
2023-02-09 09:28:32 +08:00 |
|
joylink_cuiweidong
|
2cf1412706
|
代码调整
|
2023-02-08 18:17:21 +08:00 |
|
joylink_cuiweidong
|
c448e8c9f3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 17:43:31 +08:00 |
|
joylink_cuiweidong
|
150ede0cb9
|
代码调整
|
2023-02-08 17:43:09 +08:00 |
|
dong
|
0583f03479
|
代码调整
|
2023-02-08 16:31:59 +08:00 |
|
joylink_cuiweidong
|
362caf8ef1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 15:20:08 +08:00 |
|
joylink_cuiweidong
|
52970e9e9a
|
【仿真功能】iscs界面,屏蔽门系统切换车站时以前是有订阅的,现在没了
|
2023-02-08 15:19:48 +08:00 |
|
fan
|
cdd3ee9cc4
|
实训考试成绩调整
|
2023-02-08 13:28:31 +08:00 |
|
fan
|
ce95ce4868
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-08 13:13:19 +08:00 |
|
fan
|
70277b3f24
|
实训成绩调整
|
2023-02-08 13:12:47 +08:00 |
|
dong
|
967c3e8a01
|
代码调整
|
2023-02-08 11:13:43 +08:00 |
|
joylink_cuiweidong
|
b94a5d4842
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 11:03:32 +08:00 |
|
joylink_cuiweidong
|
87c157a885
|
代码调整
|
2023-02-08 11:03:01 +08:00 |
|
dong
|
5a6106e8a1
|
代码调整
|
2023-02-08 10:59:38 +08:00 |
|
dong
|
18ebca3ee6
|
代码调整
|
2023-02-08 09:33:45 +08:00 |
|
dong
|
3569a90a9a
|
薄册--防洪安全上岗签到表
|
2023-02-07 18:27:16 +08:00 |
|
joylink_cuiweidong
|
5fbf197be4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-07 18:19:22 +08:00 |
|
joylink_cuiweidong
|
f579d37e79
|
CTC客户端的分路不良 代码调整
|
2023-02-07 18:18:50 +08:00 |
|
fan
|
96eb526713
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-07 18:00:59 +08:00 |
|
fan
|
d1611f900f
|
ibp,psl增加操作
|
2023-02-07 18:00:49 +08:00 |
|
fan
|
de7ee599f5
|
ibp,psl增加操作
|
2023-02-07 18:00:41 +08:00 |
|
joylink_cuiweidong
|
c81190b284
|
代码调整
|
2023-02-07 16:45:34 +08:00 |
|
joylink_cuiweidong
|
31f0b61e68
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-07 15:58:34 +08:00 |
|
joylink_cuiweidong
|
06c2d12354
|
CTC客户端的分路不良
|
2023-02-07 15:58:20 +08:00 |
|
dong
|
9361a11268
|
非正常情况接发列车关键环节控制表--实训操作记录
|
2023-02-07 13:38:08 +08:00 |
|
fan
|
ed1ca1287b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-07 13:17:46 +08:00 |
|
fan
|
6fa8220235
|
ctc按钮调整
|
2023-02-07 13:17:21 +08:00 |
|
joylink_cuiweidong
|
31c09eea8e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 18:09:21 +08:00 |
|
joylink_cuiweidong
|
d42612d6fa
|
代码调整
|
2023-02-06 18:09:04 +08:00 |
|
fan
|
527298f2cf
|
大铁菜单调整
|
2023-02-06 17:47:36 +08:00 |
|
joylink_cuiweidong
|
d162b96472
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 16:38:04 +08:00 |
|
joylink_cuiweidong
|
41d2c9d4d7
|
行车设备检查登记簿 代码调整
|
2023-02-06 16:37:47 +08:00 |
|
fan
|
33554fd4fb
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-06 16:11:28 +08:00 |
|
fan
|
7d765854e3
|
试卷实训调整
|
2023-02-06 16:11:13 +08:00 |
|
fan
|
745c3cfec9
|
相对运行方向 增加clearable
|
2023-02-06 16:07:58 +08:00 |
|
dong
|
be2bf8065d
|
代码调整
|
2023-02-06 14:34:42 +08:00 |
|
joylink_cuiweidong
|
9fd5ff89a4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 14:22:52 +08:00 |
|
joylink_cuiweidong
|
5fc1b0c1e4
|
大铁联锁终端上的道岔、信号机上的右键操作去掉
|
2023-02-06 14:22:32 +08:00 |
|
fan
|
639607e72a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-06 14:15:38 +08:00 |
|
fan
|
68feb49b9e
|
X引导总锁调整
|
2023-02-06 14:15:15 +08:00 |
|
dong
|
bbbcf633b9
|
添加薄册--非正常情况接发列车关键环节控制表
|
2023-02-06 13:57:31 +08:00 |
|
fan
|
8023359880
|
实训调整
|
2023-02-06 10:41:22 +08:00 |
|
fan
|
6f50c20d19
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-03 18:29:23 +08:00 |
|
fan
|
a9717d7eff
|
考试实训调整
|
2023-02-03 18:29:14 +08:00 |
|
joylink_cuiweidong
|
376e08eab9
|
添加 行车设备施工登记簿 防洪安全上岗签到表 页面
|
2023-02-03 17:56:04 +08:00 |
|
fan
|
e4a614f917
|
调整 黄金糕
|
2023-02-03 17:48:32 +08:00 |
|
dong
|
0222c60b1f
|
薄册增加tab项
|
2023-02-03 10:14:25 +08:00 |
|
dong
|
c127e36b07
|
代码调整
|
2023-02-03 09:38:14 +08:00 |
|
dong
|
0b9b2a14e1
|
添加调度命令无线受令功能
|
2023-02-02 18:09:54 +08:00 |
|
joylink_cuiweidong
|
2aae79d71e
|
【仿真功能】iscs界面,屏蔽门系统切换车站时以前是有订阅的,现在没了
|
2023-02-02 17:22:14 +08:00 |
|
joylink_cuiweidong
|
9759cb7cc1
|
【项目设备登录】泰国大铁线路的教员机,无法登录
|
2023-02-02 13:16:22 +08:00 |
|
joylink_cuiweidong
|
9639e870d0
|
【仿真功能】故障模式下的驾驶功能调用的接口不对
|
2023-01-31 17:22:34 +08:00 |
|
joylink_cuiweidong
|
9968af2ecd
|
代码调整
|
2023-01-31 15:24:36 +08:00 |
|
joylink_cuiweidong
|
7ed113aebb
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-31 14:19:36 +08:00 |
|
joylink_cuiweidong
|
47b5d939e3
|
bug修复【系统功能】项目设备管理页面的项目数据来源不对,这里项目应该通过查询而来,当前看着还是用的以前的枚举
|
2023-01-31 14:19:16 +08:00 |
|
dong
|
0f83df0dfc
|
代码调整
|
2023-01-31 11:10:59 +08:00 |
|
fan
|
6da9d76334
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-31 09:57:54 +08:00 |
|
fan
|
7f7fb6c8a7
|
考试接口参数变更
|
2023-01-31 09:57:11 +08:00 |
|
dong
|
9020db03a1
|
代码调整
|
2023-01-31 09:43:31 +08:00 |
|
dong
|
5f92af684f
|
终端菜单垂直拖拽
|
2023-01-30 17:52:26 +08:00 |
|
fan
|
728d4a1500
|
考试调整
|
2023-01-30 10:11:19 +08:00 |
|
fan
|
215e0a9ec6
|
【标准一号线】控制模式转换,车站应只有转为站控和强制站控操作,行调应该只有转为中控操作
|
2023-01-30 09:44:47 +08:00 |
|
fan
|
9e4b499399
|
考试点击实训参数调整
|
2023-01-30 09:41:23 +08:00 |
|
fan
|
4fbc4900e3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-29 18:13:55 +08:00 |
|
fan
|
b225ee5c4c
|
【线路功能】线路功能的仿真客户端是否可修改成可配置,因为有的线路某些客户端没有数据无法使用,例如佛山线没有数字沙盘、IBP盘等
|
2023-01-29 18:13:37 +08:00 |
|
dong
|
55d6c6de91
|
修改引导总锁参数集中站code错误问题
|
2023-01-29 16:44:40 +08:00 |
|
fan
|
5d560ad800
|
【大铁标准站】场景实训将信号员角色放出来
|
2023-01-29 10:05:23 +08:00 |
|
fan
|
bab270626d
|
【大铁标准站】车务终端点两次站间透明会出现列车车次窗偏移
|
2023-01-28 18:04:47 +08:00 |
|
fan
|
d2b5080b6c
|
【大铁标准站】切换调度角色后,之前的会话消息看不到了
|
2023-01-28 15:39:15 +08:00 |
|
fan
|
06e2e32150
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-28 15:07:41 +08:00 |
|
fan
|
3be9bc566c
|
【大铁标准站】实训设计时,先编制一个场景添加列车,保存背景,切换到路票,返回列表新建一个场景,点击编制,切换到联锁界面,新建的场景会自动出现列车
|
2023-01-28 15:07:27 +08:00 |
|
joylink_cuiweidong
|
53031c3d11
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-28 14:31:44 +08:00 |
|
joylink_cuiweidong
|
52b9a47ef9
|
道岔生成代码调整
|
2023-01-28 14:31:16 +08:00 |
|
fan
|
9c9ccdbfc7
|
路票填写存值错误
|
2023-01-28 10:59:01 +08:00 |
|
fan
|
3c7c4c3dfa
|
路票填写传值错误调整
|
2023-01-28 10:38:01 +08:00 |
|
fan
|
b27783f7f6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-28 09:51:51 +08:00 |
|
fan
|
6e68fde534
|
客户端创建调整
|
2023-01-28 09:51:34 +08:00 |
|
dong
|
61d9307195
|
大铁显示司机视角客户端
|
2023-01-18 16:50:42 +08:00 |
|
dong
|
1127412fbb
|
车务终端界面初始列车右键不显示菜单问题
|
2023-01-18 15:56:22 +08:00 |
|
dong
|
1751a9a4db
|
薄册输入记录错误问题
|
2023-01-18 14:47:08 +08:00 |
|
dong
|
2102d820f0
|
列车右键菜单显示项
|
2023-01-18 14:05:41 +08:00 |
|
dong
|
0343792daf
|
路票调整
|
2023-01-18 13:53:13 +08:00 |
|
dong
|
e46442cb56
|
路票不能给予司机问题
|
2023-01-18 13:24:28 +08:00 |
|
joylink_cuiweidong
|
83505d9a73
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-18 11:06:15 +08:00 |
|
joylink_cuiweidong
|
ad518bd988
|
bug修复 【大铁标准线】聊天室样式错乱
|
2023-01-18 11:05:58 +08:00 |
|
dong
|
401f3b5668
|
进路序列管理窗口控制
|
2023-01-18 10:00:33 +08:00 |
|
dong
|
f61f80d5c2
|
占线板序号
|
2023-01-18 09:44:02 +08:00 |
|
dong
|
d921acf107
|
调度命令调整
|
2023-01-17 18:27:18 +08:00 |
|
fan
|
6d9ae082ec
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-17 17:40:36 +08:00 |
|
fan
|
c488486e6c
|
【大铁标准站】场景实训编制填写路票或者许可证、簿册无法生成操作
|
2023-01-17 17:40:07 +08:00 |
|