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

2567 Commits

Author SHA1 Message Date
joylink_cuiweidong
fcf3ec5b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 14:40:27 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
fan
f1822495d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 13:23:41 +08:00
fan
12e16f9a99 BUG 152: 教学系统：在课程中点击实训进入实训后点击返回应退出到课程详情页面，目前退出到教学系统界面了，建议修改 2021-01-29 13:23:29 +08:00
lVAL
f91f045a1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:08:19 +08:00
lVAL
20a71051c7 线路：佛州 
问题：设置限速和取消限速，配置逻辑区段生成实训
 2021-01-29 11:08:03 +08:00
joylink_cuiweidong
67d7008ec0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:57:39 +08:00
joylink_cuiweidong
45572a9f2a 删除不需要的文件 2021-01-29 09:57:22 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
80cb675d9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:54:57 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
joylink_cuiweidong
a9f47fdeb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:49:59 +08:00
joylink_cuiweidong
381f26b661 成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整 2021-01-28 18:49:36 +08:00
lVAL
d4014b53c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:44:21 +08:00
lVAL
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
joylink_cuiweidong
694fe461a6 成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线，西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +08:00
joylink_cuiweidong
f6d3a6f030 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 13:38:29 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
lVAL
035ae9d367 修改 南京2 实训配置 2021-01-28 09:27:32 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
fan
3c499369a6 meger 2021-01-27 15:53:09 +08:00
fan
cb894aec34 南京二号线操作调整显示 2021-01-27 15:37:01 +08:00
lVAL
fbcfca4f9b 优化 南京2 提示信息的代码 2021-01-27 13:42:33 +08:00
lVAL
89c0b4f693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 13:31:31 +08:00
lVAL
d5dd86be69 删除南京2 无用代码 2021-01-27 13:31:18 +08:00
joylink_cuiweidong
ccaceffeca 删除暂不需要文件 2021-01-27 13:13:44 +08:00
joylink_cuiweidong
b2adbb8eda 删除不需要的文件 2021-01-27 13:06:24 +08:00
lVAL
14e7acd715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-01-27 11:25:23 +08:00
lVAL
62d52fd27f 修改南京2错误提示功能 2021-01-27 11:24:14 +08:00
joylink_cuiweidong
030a603da4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 10:40:50 +08:00
joylink_cuiweidong
c52474b771 宁波三号线（泰雷兹） 
扣车后没有显示扣车标识修改
 2021-01-27 10:38:34 +08:00
fan
d562037967 调整报警闪烁 2021-01-27 10:18:47 +08:00
fan
c0d1ffffd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:47:38 +08:00
fan
ca1b5892af 剧本编辑框和请求栈堆微调 2021-01-27 09:47:26 +08:00
lVAL
b237d09402 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:27:59 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
fan
86dfe7a5f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 18:19:14 +08:00
fan
f92e017f1b 调整南京二号线岔区设限显示 2021-01-26 18:19:04 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
aa74b86dbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 16:19:39 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
lVAL
0c527d8b63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 15:03:00 +08:00
lVAL
5858bb1eb3 优化代码 2021-01-26 15:02:39 +08:00
fan
324f662c8f BUG109: 浙大网新：站台设置停站时间时有误，详细请看图 2021-01-26 14:54:37 +08:00
joylink_cuiweidong
519916458f 成都三号线 实训操作定义代码调整 2021-01-26 14:40:17 +08:00
joylink_cuiweidong
2525d57f8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:04:36 +08:00
joylink_cuiweidong
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +08:00
fan
4f911227fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 13:07:11 +08:00
fan
c32009a9d2 南京二号线折行显示列车调整 2021-01-26 13:07:02 +08:00
joylink_cuiweidong
ebcd6b9bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 11:10:38 +08:00
joylink_cuiweidong
7d0a4269e6 运行图绘制代码调整 
南京二号线 运行图转换函数代码调整
 2021-01-26 11:10:18 +08:00
lVAL
9602cfc27a 修改实训查询 表单联动查询的问题 2021-01-26 11:05:18 +08:00
lVAL
c2ecb60cd7 修改 南京2 刚登陆进去执行操作异常的问题 2021-01-26 10:42:39 +08:00
lVAL
8d9114cfa7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 09:36:04 +08:00
lVAL
c3553c87f1 修改 南京2现地登录操作问题 2021-01-26 09:35:54 +08:00
joylink_cuiweidong
212b286408 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:36:38 +08:00
joylink_cuiweidong
da2caf0396 运行图 代码调整 2021-01-25 18:36:22 +08:00
lVAL
8ecbee01b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:23:32 +08:00
lVAL
d325a10c40 配置宁波3 线路 实训 2021-01-25 18:23:23 +08:00
joylink_cuiweidong
194b31094d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:48:00 +08:00
joylink_cuiweidong
6b0d8cf772 代码调整 2021-01-25 17:47:49 +08:00
lVAL
388bd1e328 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:43:46 +08:00
lVAL
1f9ade8ec8 修改宁波一 实训代码格式 2021-01-25 17:43:38 +08:00
fan
b427f8a8e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:42:11 +08:00
fan
f4db53df3f 调整南京二号线显示问题 2021-01-25 17:42:01 +08:00
lVAL
78863b868c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:30:27 +08:00
lVAL
76a7d1fe83 修改西安二号线实训折返不发指令的问题 2021-01-25 17:30:16 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
6d70fd3fb2 成都三号线（交控）现地 人工控/自动控 操作定义代码调整 2021-01-25 14:05:51 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
41447e97dc 代码调整 2021-01-25 13:51:13 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
98342c2423 南京二号线遮盖信号机的颜色调整 2021-01-25 10:23:13 +08:00
fan
7e026191c9 报警和记录框无法拖动，是固定的。 2021-01-25 09:57:20 +08:00
fan
a55f69a3cb 南京二号线 延时解锁 2021-01-22 21:28:30 +08:00
fan
e574bcf2eb 南二 挤岔恢复 2021-01-22 21:14:20 +08:00
fan
cf871345e3 注释南京二列车操作 2021-01-22 19:52:08 +08:00
fan
67a061d9da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:35:23 +08:00
fan
32f68ed895 道岔状态调整 2021-01-22 19:35:14 +08:00
joylink_cuiweidong
8373a96229 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:18:37 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
lVAL
d9de6c2548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 18:58:33 +08:00
lVAL
b5d69120ff 增加 宁波三 实训部分配置，以及修改西安控制模式操作提示未知错误的问题 2021-01-22 18:58:01 +08:00
fan
0d8a6df9de 预复位调整 2021-01-22 18:33:21 +08:00
fan
3407d4d13b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:47:05 +08:00
fan
d2d854b0c0 预复位调整 2021-01-22 17:46:51 +08:00
lVAL
4211651bcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:39:26 +08:00
lVAL
584a30a634 增加 区段的新建列车操作，以及菜单实训operate配置 2021-01-22 17:39:12 +08:00
fan
97d8a66ccb 道岔的故障和预复位的显示 2021-01-22 16:55:00 +08:00
lVAL
527f59cc58 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 15:00:50 +08:00
lVAL
2ec8d1686a 福州线排查操作和实训情况 2021-01-22 15:00:36 +08:00
fan
e0fe554699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 13:59:42 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
lVAL
277252916c 修改成都3操作优化，以及实训配置修正 2021-01-22 10:57:27 +08:00
joylink_cuiweidong
5d7810b6f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:19:41 +08:00
joylink_cuiweidong
3e6da71787 代码调整 2021-01-21 19:19:20 +08:00
fan
2cdbc1ee78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:12:17 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
joylink_cuiweidong
2b6e1ca117 岔心 代码调整 2021-01-21 19:02:28 +08:00
joylink_cuiweidong
a9ea00c0c8 南京十一站 代码调整 2021-01-21 18:39:00 +08:00
fan
60e82ec34e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:45:09 +08:00
fan
ff6dac7c60 南二强解道岔&强解区段 2021-01-21 17:44:57 +08:00
lVAL
49b7de7cae 调整西安 开放自动进路和关闭自动进路 实训 2021-01-21 17:08:17 +08:00
lVAL
84306b2507 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:00:22 +08:00
lVAL
1e488cdec6 西安2号线，修改开放自动进路和取消自动进路 实训配置 2021-01-21 17:00:12 +08:00
lVAL
0b9aeacda3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:52 +08:00
joylink_cuiweidong
5fec6faef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:49 +08:00
lVAL
2f2316e353 增加西安2区故解流程 2021-01-21 16:38:44 +08:00
joylink_cuiweidong
21f4b004c9 西安二号线 开放自动进路/关闭自动进路 操作添加 2021-01-21 16:38:29 +08:00
fan
45fd2d348b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:32:22 +08:00
fan
5b69262124 南京二好像长闪短闪调整 2021-01-21 16:32:11 +08:00
joylink_cuiweidong
8e958875f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:54:13 +08:00
joylink_cuiweidong
e5069bbe92 西安二号线 部分操作 暂时隐藏 2021-01-21 15:53:51 +08:00
lVAL
56df3cd81c 添加 南京2 道岔 强解道岔配置 2021-01-21 15:53:37 +08:00
lVAL
bdbd5b9cc0 删除 福州2现地定位反位右键操作 2021-01-21 15:49:52 +08:00
lVAL
5bf71f2d7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:28:32 +08:00
lVAL
c3c3548574 修改，西安2 删除现地 信号机封锁解封配置 2021-01-21 15:28:21 +08:00
joylink_cuiweidong
5b1e331d26 岔心区段 批量设置集中站 调整 2021-01-21 14:49:02 +08:00
joylink_cuiweidong
be9e15567e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 14:15:18 +08:00
joylink_cuiweidong
16f255fcae bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整 2021-01-21 14:15:00 +08:00
fan
e71fe4cea8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 13:45:32 +08:00
fan
6df9350155 卡斯柯实训调整&南京二号线封锁调整 2021-01-21 13:45:20 +08:00
lVAL
eac5a23ddf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-21 11:10:52 +08:00
lVAL
b8a36028fd 增加 佛山线全线限速配置注释 2021-01-21 11:09:51 +08:00
joylink_cuiweidong
1d32bd66b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-21 11:04:25 +08:00
joylink_cuiweidong
cd9aa64552 佛山线路 实训代码调整 2021-01-21 11:02:04 +08:00
lVAL
322f0724c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:42:27 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
356ec2db79 南京二号线调整 2021-01-21 10:13:30 +08:00
fan
ac4580f1b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:06:13 +08:00
fan
89700f2245 卡斯柯调整 2021-01-21 10:05:59 +08:00
lVAL
8e634b78e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:45:24 +08:00
lVAL
9ed523fb86 增加佛州控制模式 2021-01-20 18:45:05 +08:00
fan
50321992c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:29:24 +08:00
fan
75e48959ba 调整生成课程和试卷问题&设置运行等级报错调整 2021-01-20 18:29:12 +08:00
joylink_cuiweidong
ea99e7a9e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:13:58 +08:00
lVAL
2dc837020c 增加控制模式实训 2021-01-20 18:14:03 +08:00
joylink_cuiweidong
7171601b06 佛山线路 实训 代码调整 2021-01-20 18:13:42 +08:00
lVAL
2408e28509 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-20 17:53:00 +08:00