joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
10,471 Commits 20 Branches 0 Tags 448 MiB
abf36ad841
Commit Graph

3068 Commits

Author SHA1 Message Date
yuan
118a8d07d4 错别字修改 2021-06-28 10:21:16 +08:00
yuan
0c219aff71 抽线 2021-06-25 15:34:51 +08:00
yuan
51a0ebd5fe 抽线 2021-06-25 15:34:35 +08:00
fan
b9eb5f061d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-24 13:55:06 +08:00
fan
e1b5c43fb7 zc设备数据添加noService属性 2021-06-24 13:54:44 +08:00
joylink_cuiweidong
65c235bfcd 第三方登陆跳转代码调整 2021-06-24 13:05:00 +08:00
fan
08b824dd5a Bug323 西安三：现地无法切换车站，提示：调整角色成员失败 2021-06-23 10:09:19 +08:00
yuan
3081681aaf Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder 2021-06-22 17:19:03 +08:00
yuan
f032e3f1ee 地图编辑-应答器增加一键关联到信号机功能 2021-06-22 17:18:49 +08:00
joylink_cuiweidong
c7569931ff 哈尔滨线路问题 上行设置了越站后显示在轨道上看不清楚，需要调一下位置。 2021-06-22 17:06:09 +08:00
yuan
1523ab6f51 应答器关联区段显示bug修复,增加选中高亮 2021-06-22 14:40:21 +08:00
joylink_cuiweidong
21115775fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-22 10:14:59 +08:00
joylink_cuiweidong
a6d01035dd 成都三，福州一实训 说明修改 2021-06-22 10:14:39 +08:00
fan
4efa513836 调整计轴故障ARB优先级 2021-06-22 09:27:11 +08:00
joylink_cuiweidong
14da4cbc2b 成都三号线 实训说明调整 2021-06-21 16:49:13 +08:00
joylink_cuiweidong
22af8c1af7 西安二号线 宁波三号线 实训说明修改 2021-06-21 14:13:00 +08:00
joylink_cuiweidong
406f23eb7c 福州一 宁波一 实训 描述修改 2021-06-21 13:24:35 +08:00
fan
1fdde772c1 BUG316哈尔滨：右键点击列车车次框，不应弹出列监对话框，只左键点击弹出即可&BUG312哈尔滨：现地无法追踪全开 2021-06-16 16:55:38 +08:00
fan
f9ee7ff8e8 哈尔滨行调不显示基础按钮 2021-06-16 14:50:14 +08:00
joylink_cuiweidong
7ea966b539 西安三 行调添加 强制取消扣车 2021-06-16 10:30:17 +08:00
joylink_cuiweidong
eeb75b6a6d Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-15 15:34:42 +08:00
joylink_cuiweidong
a0861633f2 zc 添加管理的区段列表（计轴区段） 2021-06-15 15:33:50 +08:00
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +08:00
joylink_cuiweidong
79fa65c145 宁波一号线 实训操作定义中的 实训说明 修改 2021-06-11 09:17:38 +08:00
joylink_cuiweidong
c024fd281f 更改宁波一号线的 操作定义中的 实训说明 2021-06-10 13:42:33 +08:00
joylink_cuiweidong
e31f5aaed5 更改福州一号线的 操作定义中的 实训说明 2021-06-10 11:10:53 +08:00
joylink_cuiweidong
de337d4aa6 西安三 菜单修改 
CM改成SM
URM改成NRM
 2021-06-09 17:05:40 +08:00
fan
4b7e2efcba 西安三号线ibp盘扣车显示调整 2021-06-08 16:00:55 +08:00
fan
1ed9fd4d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-08 14:44:36 +08:00
fan
c09da2aa5d 列车操作调整 2021-06-08 14:44:23 +08:00
yuan
3093a1bc1c 修改PSL菜单显示逻辑为非故障模式且角色为车站值班员 2021-06-08 10:08:48 +08:00
yuan
c3a3f8ce63 修正PSL试灯按钮不显示 2021-06-07 10:08:50 +08:00
fan
2524e45c42 Revert "Revert "PSL"" 
This reverts commit 9832b0c8
 2021-06-07 09:12:43 +08:00
fan
c0c1ef8d05 Revert "Revert "PSL"" 
This reverts commit 74249e59
 2021-06-07 09:12:13 +08:00
fan
74249e5992 Revert "PSL" 
This reverts commit 185a3eff
 2021-06-04 18:06:01 +08:00
fan
9832b0c87f Revert "PSL" 
This reverts commit 786d0f7a
 2021-06-04 18:05:43 +08:00
yuan
95ce742d95 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 17:55:58 +08:00
yuan
786d0f7a9f PSL 2021-06-04 17:55:39 +08:00
fan
eb6ad1d7c8 调整列车故障处理 限速指令 参数范围和提示 2021-06-04 16:21:21 +08:00
fan
eeb52c7911 西安三列车菜单操作增加单位和提示 2021-06-04 16:12:16 +08:00
yuan
aa395d1206 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 16:06:12 +08:00
yuan
185a3eff6e PSL 2021-06-04 16:05:56 +08:00
fan
b6a373a34a 西安三列车菜单位置调整 2021-06-04 14:57:08 +08:00
fan
4d89906af4 Merge remote-tracking branch 'origin/test_xian03training' into test 2021-06-04 09:52:12 +08:00
fan
16c5659bb9 调整西安三号线早晚点文字提示 2021-06-03 18:09:43 +08:00
fan
7ea850497a 西安三号线问题调整 2021-06-03 17:31:50 +08:00
fan
70d1ed2ce6 Merge branch 'test_xian03training' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03training 2021-06-03 13:09:49 +08:00
fan
ae756864cf 西安三号线实训调整 2021-06-03 13:09:35 +08:00
joylink_cuiweidong
2a5ab20cde 西安三 界面 设置停站时间 显示重叠 2021-06-03 11:19:07 +08:00
yuan
c9af4a7031 emmm 2021-06-03 09:58:24 +08:00
fan
ad0cbdbd0f 南京二号线现地初始化列车没清调整 2021-06-02 10:22:24 +08:00
fan
3301f9abcd 南京二号线车站显示模块调整 2021-06-01 18:13:13 +08:00
fan
e134b23fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:50:46 +08:00
fan
25f546b205 南京二号线车站显示模块调整 2021-06-01 17:50:37 +08:00
joylink_cuiweidong
56ea29660f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:29:33 +08:00
joylink_cuiweidong
d58c80888e 西安三号线 添加道岔定反位失表 2021-06-01 17:29:02 +08:00
fan
35db44cd42 列车故障操作驾驶至调整 2021-06-01 15:36:18 +08:00
fan
a52c2d2126 信号机接近区段 2021-06-01 14:22:09 +08:00
fan
a8ce67ee4a 南京二号线调整 2021-06-01 14:06:18 +08:00
fan
9ac45050f9 列车指令调整 2021-06-01 11:01:02 +08:00
fan
a3b62e203d 列车指令调整 2021-06-01 10:22:10 +08:00
fan
9f4841e9e0 列车指令调整 2021-06-01 10:13:10 +08:00
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +08:00
fan
d11b0c6d47 增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭 2021-05-28 17:18:51 +08:00
fan
70ca57d26c 时刻表列车总览详览迁移 2021-05-28 11:00:26 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-28 10:18:57 +08:00
fan
1b5da46e80 背投轨道总览详览调整 2021-05-28 10:10:54 +08:00
joylink_cuiweidong
411099fdc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 09:33:48 +08:00
joylink_cuiweidong
1c2f663d9c 西安三号线 行调添加设置/取消自动触发、自动进路 2021-05-27 09:33:15 +08:00
fan
b776b48bf5 哈尔滨列监显示条件限制 2021-05-26 17:25:16 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
joylink_cuiweidong
04f156cc28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 15:01:26 +08:00
joylink_cuiweidong
7b3e127898 南京二号线 十一站型 时刻表 页面添加 2021-05-26 15:01:02 +08:00
fan
49c1eba347 列监代码显示 2021-05-26 14:19:40 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
455fe9dccd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:40:29 +08:00
fan
c4b4955541 BUG176、174 2021-05-26 10:40:17 +08:00
joylink_cuiweidong
300dd3d6d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:16:45 +08:00
joylink_cuiweidong
cc4eaf034c 西安三号线 右键的车站切换划分问题（bug281） 2021-05-26 10:16:22 +08:00
fan
5188192736 BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示 2021-05-25 17:53:23 +08:00
fan
3b3c964636 宁波问题调整 2021-05-25 16:33:20 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
fan
a42e3ecafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-25 13:18:19 +08:00
fan
3ea6c67b0f 哈尔滨问题调整 2021-05-25 13:17:55 +08:00
joylink_cuiweidong
60fce71f8a 西安三号线 鼠标右键无法出现菜单快速切换车站 处理 2021-05-25 10:36:20 +08:00
joylink_cuiweidong
8abbe2e05a 修改西安三号线问题 道岔失表不能设置定位或反位失表，只能设置成道岔定反位都失表 2021-05-25 09:48:54 +08:00
fan
6ec48dab9d BUG273 设置故障时，点击故障列表后，直接点击关闭按钮，故障列表还会显示 2021-05-24 17:41:54 +08:00
fan
8c1e968213 BUG269 哈尔滨：报警信息缺少故障描述 2021-05-24 17:01:10 +08:00
fan
640793241a BUG270 问题调整 2021-05-24 16:08:52 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
fan
22cfed1774 暂提 2021-05-21 09:42:03 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
zyy
9789fb4d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 16:38:08 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
fan
3ac0069577 暂提 2021-05-20 15:53:21 +08:00
fan
1b62198d55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:40:10 +08:00
fan
0b716d7bc3 pad检索调整 2021-05-20 15:39:44 +08:00
fan
32ef41b405 暂提 2021-05-20 15:18:02 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示，地图绘制新增 2021-05-20 15:13:37 +08:00
fan
6590c10ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:06:24 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
joylink_cuiweidong
7094b1d497 南京二号线 列车详览页面 代码调整 2021-05-20 15:05:57 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
joylink_cuiweidong
beb086e57f 南京二号线 列车总览页面 代码调整 2021-05-20 09:20:31 +08:00
joylink_cuiweidong
f20793ec0d 代码调整 2021-05-19 18:11:32 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
joylink_cuiweidong
7cac00b163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 16:46:29 +08:00
joylink_cuiweidong
e6e09d24fb 代码调整 2021-05-19 16:46:07 +08:00
fan
9b422cd3b9 南京二号线调整（未完） 2021-05-19 16:07:52 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
f1d41844dc 南京二列车操作报错提示 & BUG267 2021-05-18 13:47:22 +08:00
fan
df68e9a969 tro 轨道总览 2021-05-18 13:36:06 +08:00
zyy
6ba7b730a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:16:38 +08:00
zyy
9a2785f126 调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道 2021-05-17 18:16:22 +08:00
fan
4384e36314 BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字 2021-05-17 18:03:44 +08:00
fan
d00f74e190 大铁线路图纸检索 2021-05-17 17:29:33 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
9554643f05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 16:14:17 +08:00
fan
02eaa33fec 背投调整 2021-05-17 16:14:00 +08:00
zyy
17f25b1e0b 处理冲突文件 
#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-17 15:58:57 +08:00
zyy
050d5854d1 增加南京区段操作流程，请求暂未调整 2021-05-17 15:57:07 +08:00
fan
5c5a1db13d Bug262 福州一：紧急停车状态表示有问题 2021-05-17 15:52:26 +08:00
fan
122ca9ec6b 列车操作调整 2021-05-17 15:13:26 +08:00
fan
dfc5d50fbe ATS显示调整 2021-05-17 14:39:16 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
fan
01fdc0ef22 加载时刻表 2021-05-14 18:08:12 +08:00
fan
666e85dec6 车次号步进 2021-05-14 16:49:27 +08:00
fan
69c6526516 Bug260 、Bug261、郑州共赢代码调整 2021-05-14 15:59:04 +08:00
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
joylink_cuiweidong
d52a5837b4 宁波三 列车绘图代码调整 2021-05-12 14:17:14 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
be3ea8384a 添加站台紧急停车 2021-05-08 13:31:19 +08:00
fan
67f1076dec 故障调整 2021-05-08 09:22:16 +08:00
fan
181caff10c 哈尔滨添加故障操作 2021-05-07 16:16:36 +08:00
fan
49d19a7d14 大铁去掉mBar 2021-05-06 16:25:13 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
8087d87b22 大铁线路操作调整 
(cherry picked from commit 0a0917dd32)
 2021-04-30 10:24:18 +08:00