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

1987 Commits

Author SHA1 Message Date
fan
318d120db6 BUG 107: 浙大网新仿真线路：对立的功能应设置有误 2021-01-29 15:01:38 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +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
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
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
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +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
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +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
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
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +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
d325a10c40 配置宁波3 线路 实训 2021-01-25 18:23:23 +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
76a7d1fe83 修改西安二号线实训折返不发指令的问题 2021-01-25 17:30:16 +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
fan
7e026191c9 报警和记录框无法拖动，是固定的。 2021-01-25 09:57:20 +08:00
fan
e574bcf2eb 南二 挤岔恢复 2021-01-22 21:14:20 +08:00
fan
cf871345e3 注释南京二列车操作 2021-01-22 19:52:08 +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
584a30a634 增加 区段的新建列车操作，以及菜单实训operate配置 2021-01-22 17:39:12 +08:00
lVAL
2ec8d1686a 福州线排查操作和实训情况 2021-01-22 15:00:36 +08:00
lVAL
277252916c 修改成都3操作优化，以及实训配置修正 2021-01-22 10:57:27 +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
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
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
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
lVAL
87f2d274d1 修改指令 2021-01-20 17:52:34 +08:00
joylink_cuiweidong
913a9229d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 17:47:22 +08:00
joylink_cuiweidong
cc462621f5 佛山线 实训 代码调整 2021-01-20 17:47:05 +08:00
lVAL
338a7c9cbe 增加信号机封锁解封 实训 2021-01-20 17:42:42 +08:00
lVAL
711f0bc70a 修改 成都3 实训配置情况 2021-01-20 16:33:19 +08:00
lVAL
78822e9c30 成都3 实训引导总锁配置，先注释掉 2021-01-20 16:10:14 +08:00
lVAL
5764a103c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:51 +08:00
lVAL
c8e2b30271 增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训 2021-01-20 15:53:36 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
fan
a7d4e0c195 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 13:50:57 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
joylink_cuiweidong
79f0de576c 代码调整 2021-01-20 11:16:09 +08:00
joylink_cuiweidong
5cbfa16d6c bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改 2021-01-20 10:16:15 +08:00
joylink_cuiweidong
3c76a3139c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 09:54:26 +08:00
joylink_cuiweidong
5b5d635f07 bug103 设置停站时间范围改为15-300S 修改 2021-01-20 09:54:01 +08:00
fan
92929a02fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 19:03:53 +08:00
fan
0126066322 调整传输信号机选择 2021-01-19 19:03:42 +08:00
joylink_cuiweidong
df6ede1e4b 南京二号线 站台操作调整 2021-01-19 17:14:47 +08:00
joylink_cuiweidong
9828c65b26 代码调整 2021-01-19 14:07:57 +08:00
joylink_cuiweidong
be344cf815 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-19 14:00:32 +08:00
joylink_cuiweidong
d404ed01dc 代码调整 2021-01-19 13:57:35 +08:00
fan
606c4ae301 menuButton调整 2021-01-19 13:56:45 +08:00
fan
12be0c61cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:26:05 +08:00
fan
daea6e1760 传输信号机选中状态 2021-01-19 13:25:53 +08:00
lVAL
696af622b7 调整南京2岔芯设置限速和设置封锁 2021-01-19 13:03:43 +08:00
lVAL
396d7ec14e 修改南京2号线菜单配置方式 2021-01-19 10:31:31 +08:00
lVAL
267a815956 修改南京2按钮配置 2021-01-19 09:54:45 +08:00
joylink_cuiweidong
05a8c85d6b 代码调整 2021-01-19 09:20:37 +08:00
joylink_cuiweidong
4cbc3de4ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 18:06:23 +08:00
joylink_cuiweidong
ba80512efa 南京二号线 站台添加 月台 按钮 2021-01-18 18:06:08 +08:00
fan
07ad4c85dd 被覆盖代码重新提交 2021-01-18 17:41:46 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
lVAL
9617c36d01 修改控制模式 disabled 控制 2021-01-18 16:53:54 +08:00
fan
cff6a78d3a 南京二号线行调点击空白关闭 2021-01-18 16:22:26 +08:00
joylink_cuiweidong
d322aad5d4 南京二号线 站台安全门 通信正常开启状态 调整 2021-01-18 15:16:00 +08:00
joylink_cuiweidong
74b9c8cc7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 13:40:29 +08:00
joylink_cuiweidong
5687ffc5a8 南京二号线 区段 轨区设限 代码调整 2021-01-18 13:37:45 +08:00
fan
e7f2d73857 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:42:43 +08:00
fan
649691b1c3 操作表盘调整 2021-01-15 18:42:17 +08:00
lVAL
a70de561ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 18:10:23 +08:00
lVAL
fd5d8245c7 修改代码 2021-01-15 18:10:14 +08:00
fan
844b2ee382 南京二号线引导进路 2021-01-15 17:52:54 +08:00
lVAL
89dacd7deb 增加南京2号线 信号机配置 2021-01-15 16:40:23 +08:00
lVAL
5b4e15a979 修改操作提示 2021-01-15 16:12:49 +08:00
lVAL
cc5ee4661f 修改 发送命令后 提示的信息 2021-01-15 16:09:26 +08:00
fan
93eaaacd96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:34:35 +08:00
fan
0caf3d233a 排列进路 2021-01-15 13:34:25 +08:00
lVAL
25e89c9b1c 配置强解 道岔和区段，（道岔等待后端确定指令） 2021-01-15 12:25:25 +08:00
lVAL
2024cef7c9 修改南京仿真bar遮挡运行图的问题 2021-01-15 12:18:27 +08:00
fan
12925e92bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:21:22 +08:00
fan
29c8e5b4b9 暂提 2021-01-15 11:21:11 +08:00
lVAL
80f8ecf19f 修改南京2号线 tempData 报错问题 2021-01-15 11:16:17 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
lVAL
4c89a777ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:53:46 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
fan
0671c6e733 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:42:36 +08:00
fan
15928a6248 道岔封锁状态调整 2021-01-15 09:42:19 +08:00
lVAL
cb364658fc 修改替换错误 2021-01-15 09:39:27 +08:00
lVAL
41f1253746 修改 南京2号线 中心操作弹窗为非模式对话框 2021-01-15 09:34:16 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
fan
359e24dfbd merge 2021-01-14 16:35:45 +08:00
lVAL
2fc70489eb 修改南京2号线菜单皮肤 2021-01-14 15:44:56 +08:00
lVAL
eb7fa1f5cb 修改实现南京2行调和现地界面操作 2021-01-14 15:32:17 +08:00
lVAL
22403b198d 修改南京2号线菜单，以及样式 2021-01-14 14:15:02 +08:00
joylink_cuiweidong
b33e4b92ed 暂时 注释 西安二号线 未实现的 功能 2021-01-12 17:57:44 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
fan
ec5b0e0a1e 西门子列车未实现操作注释 2021-01-11 11:04:14 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
joylink_cuiweidong
8145673f5d 成都三号线 代码调整 2021-01-08 09:54:04 +08:00
joylink_cuiweidong
728ba4b47b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 11:28:11 +08:00
joylink_cuiweidong
6e3cdc6bd1 bug56 设置运行等级后，查询站台状态显示自动 代码调整 2021-01-06 11:27:55 +08:00
lVAL
0ad6925791 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 10:21:20 +08:00
lVAL
0e37349fcd 修改，站台设置跳停和取消跳停现地没有生成实训的配置问题 2021-01-06 10:21:11 +08:00
joylink_cuiweidong
923e3ba05c bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改 2021-01-06 09:32:27 +08:00
joylink_cuiweidong
411bde3aee bug 64 苏电院交控仿真线路：信号解封无效 调整 2021-01-05 18:19:02 +08:00
joylink_cuiweidong
dd0a0b2fdf bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改 2021-01-05 17:31:03 +08:00
lVAL
cc2814f722 增加西安2号线实训配置 2021-01-05 16:05:13 +08:00
lVAL
e8d1777703 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 15:08:08 +08:00
lVAL
ea7d29f520 增加 信号机解封实训配置 2021-01-05 15:07:54 +08:00
joylink_cuiweidong
9684fd6937 信号机 取消封锁 使能 操作代码调整 2021-01-05 14:45:10 +08:00
fan
0a9ca02ae9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:57:05 +08:00
fan
175d5b1810 代码调整 2021-01-05 13:56:51 +08:00
joylink_cuiweidong
dcfd22463b 西安二号线 指令操作调整 2021-01-05 13:45:29 +08:00
lVAL
f11ded27f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 11:30:34 +08:00
lVAL
f35628f130 修改道岔单锁实训流程问题 2021-01-05 11:30:25 +08:00
joylink_cuiweidong
bc791715f4 西安二号线 操作代码调整 2021-01-05 09:43:09 +08:00
lVAL
1c04595c38 补充 西安二号线 实训配置 2021-01-05 09:13:09 +08:00
lVAL
0d183d53ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 18:25:42 +08:00
lVAL
e9c3a49612 添加缺失的实训配置（未调整，未验证） 2021-01-04 18:25:33 +08:00
fan
d31c9c1da3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 17:52:52 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
7468e2edcb 注释掉，宁波三仿真操作功能无关的操作 2021-01-04 17:37:56 +08:00
joylink_cuiweidong
e3584dc2ea 西安二号线 紧急本地控制（紧急站控） 操作代码调整 2021-01-04 15:39:54 +08:00
fan
b71962d77c 浙大网新 扣车和取消扣车实训调整 2021-01-04 14:50:13 +08:00
joylink_cuiweidong
1a65264d64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:48:28 +08:00
joylink_cuiweidong
4151680a6a 西安二号线 现地 控制权转移 代码调整 2021-01-04 14:48:09 +08:00
fan
3c7f96614d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:03:40 +08:00
fan
f73fcff33e 浙大网新 跳停和取消跳停 2021-01-04 14:03:26 +08:00
joylink_cuiweidong
ad2e6ed0f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 18:03:17 +08:00
joylink_cuiweidong
a024699e8f 西安二号线 控制模式 绘图调整 2020-12-31 18:02:55 +08:00
fan
c5fd6a97a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 16:40:29 +08:00
fan
386cda6dba Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整 2020-12-31 16:40:13 +08:00
joylink_cuiweidong
5ec5d451d0 西安二号线 右键操作 代码调整 2020-12-31 14:57:53 +08:00
joylink_cuiweidong
2d831ca398 bug12（哈尔滨仿真线路里的交出控制功能逻辑问题）修改 2020-12-31 14:13:51 +08:00
lVAL
da1fa87021 修改代码 2020-12-28 17:39:47 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
1d775c4529 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:41:56 +08:00
fan
b24e59bc9a 代码调整 2020-12-28 16:41:37 +08:00
joylink_cuiweidong
0b606fbc56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:25:49 +08:00
joylink_cuiweidong
dbbd817aad 哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整 2020-12-28 16:25:29 +08:00
fan
908aa12c21 bug: 11 设置运行等级显示问题 2020-12-28 16:00:55 +08:00
fan
e9a0359b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 15:01:35 +08:00
fan
16206cd003 bug: 1 & 紧急停车调整 & bug: 10 2020-12-28 15:01:25 +08:00
joylink_cuiweidong
906e12d508 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 13:03:18 +08:00
joylink_cuiweidong
fc4d130675 宁波三号线 站台操作调整 2020-12-28 13:02:33 +08:00
fan
614f835701 成都一号线两个确认运行至前方站 2020-12-28 11:24:25 +08:00
joylink_cuiweidong
940f01a89e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 18:07:15 +08:00
joylink_cuiweidong
418e8b86a4 宁波三号线 行调操作代码调整 2020-12-25 18:06:08 +08:00
lVAL
d229e5ca59 调试 宁波3号线 指令 2020-12-25 18:05:49 +08:00
lVAL
ac3ee7cf7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:24:59 +08:00
lVAL
d5315ef81b 增阿基指令分页的功能 2020-12-25 14:24:47 +08:00
joylink_cuiweidong
18a8b75a98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:02:33 +08:00
joylink_cuiweidong
9dfc64ea0a 宁波三号线 真实运行图 导入代码调整 2020-12-25 14:02:03 +08:00
fan
ada7d199c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 11:18:09 +08:00
fan
2aa6cb1f8f 哈尔滨操作调整&ibp调整 2020-12-25 11:17:56 +08:00
joylink_cuiweidong
1a7b0b0301 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 09:08:47 +08:00
joylink_cuiweidong
d74564f9b1 宁波三号线运行图导入代码调整 2020-12-25 09:08:31 +08:00
lVAL
0d8ff932a0 修改组件操作报错的问题 2020-12-24 18:35:26 +08:00
joylink_cuiweidong
31605db52e 成都三号线 实训定义调整 2020-12-23 16:39:53 +08:00
joylink_cuiweidong
8b04f92d7a 成都的三号线 信号封锁状态 绘图代码调整 2020-12-23 10:23:29 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
7f23431ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 18:16:22 +08:00
joylink_cuiweidong
b5ebe1599d 成都三号线 现地工作站 指令操作代码调整 2020-12-22 18:16:06 +08:00
zyy
8c245127e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:08:19 +08:00
zyy
580c24e785 调整西安二号线操作 2020-12-22 17:08:05 +08:00
joylink_cuiweidong
59371074ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 15:18:58 +08:00
joylink_cuiweidong
b8fde7dd74 地图绘图代码调整 
成都三号线 行调工作站 指令代码调整
 2020-12-22 15:18:10 +08:00
zyy
3a5eaaa544 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:27:30 +08:00
zyy
912d80caec 调整ibp盘创建 保存 2020-12-22 10:27:14 +08:00
fan
bd775d7178 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:03:30 +08:00
fan
2c23ec76e9 ZC故障调整 2020-12-22 10:03:17 +08:00
zyy
97636fa64a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 09:03:57 +08:00
zyy
0abba7cdbc 调整实训操作 2020-12-22 09:03:42 +08:00
fan
4210e2fba7 哈尔滨 重启令解调整 2020-12-21 21:55:36 +08:00
fan
a00b5c0581 道岔名称 站台E灰显 2020-12-21 20:10:48 +08:00
fan
239da4d74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 16:09:54 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
zyy
49a6fffdfc 调整宁波线路实操定义 2020-12-21 15:18:51 +08:00
joylink_cuiweidong
5f00a98526 箭头绘图代码调整 2020-12-21 13:52:45 +08:00
joylink_fanyuhong
1915215083 取消越战 非安全命令 2020-12-18 21:18:57 +08:00
fan
9ba280bc03 南铁院专业版配置调整 2020-12-18 17:20:09 +08:00
fan
31954a545d 哈尔滨操作调整 2020-12-18 14:10:25 +08:00
joylink_cuiweidong
213d14b212 新增南京二号线 线路配置文件 2020-12-18 09:30:18 +08:00
joylink_cuiweidong
acd8c46a65 代码调整 2020-12-17 16:37:10 +08:00
joylink_cuiweidong
d6b58f5ffb 哈尔滨线路日志功能添加 2020-12-17 16:24:29 +08:00
zyy
24b95e3811 调整成都一报错 2020-12-16 16:22:24 +08:00
zyy
34bff76eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 15:37:22 +08:00
zyy
c2f6c3461b 调整宁波三，增加字段 2020-12-16 15:37:09 +08:00
joylink_cuiweidong
5a5193cde5 北交大客流 运行图代码调整 2020-12-16 11:14:35 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
zyy
0c936bb0ce 调整宁波三控制权操作 2020-12-15 16:59:51 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
zyy
02a6293d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 11:29:43 +08:00
zyy
0310ee6c57 调整地图流程 2020-12-14 11:29:26 +08:00
fan
a80b6c7fb0 一键领取权限 2020-12-11 19:28:38 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
fan
aa4012b08f 宁波三号线操作 2020-12-10 14:50:43 +08:00
fan
9114578e22 宁波三号线操作 2020-12-10 14:40:41 +08:00
fan
c118fccd3f 宁波三号线操作调整 2020-12-10 10:01:51 +08:00
fan
a9b94c8e5d 国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线 2020-12-08 18:43:55 +08:00
joylink_cuiweidong
a0e3875e69 实训平台样式调整 2020-12-04 15:46:45 +08:00
fan
ac8f9bc978 哈尔滨限速调整 2020-12-04 10:07:55 +08:00
fan
817c5bdb9b 哈尔滨限速调整 2020-12-03 18:39:27 +08:00
fan
05f6324413 company update 2020-12-03 18:22:04 +08:00
fan
6cc64d7cfc 导入学生信息添加loading&哈尔滨日志 2020-12-02 18:38:28 +08:00
fan
d8f8acfe02 单位调整&哈尔滨区段限速调整 2020-12-02 14:22:26 +08:00
zyy
900064a767 调整福州线路实训操作 2020-11-27 16:26:42 +08:00
zyy
eabb4b8782 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:15:32 +08:00
zyy
6b8bfffd21 调整限速实训流程 2020-11-27 14:15:19 +08:00
joylink_cuiweidong
90ec120603 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:05:28 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
zyy
032c3036b8 调整国赛系统样式名称 2020-11-27 09:22:25 +08:00
joylink_cuiweidong
1f7c3f3bf7 宁波一号线 人解进路更换指令（之前为信号机取消引导，换为人解进路） 2020-11-26 18:52:53 +08:00
joylink_cuiweidong
3132506382 宁波一号线 取消进路 指令 换成 总取消 2020-11-26 18:21:57 +08:00
joylink_cuiweidong
2dad05d63f 福州一号线 西安三号线 实训定义代码调整 2020-11-26 17:22:49 +08:00
joylink_cuiweidong
00e60e877c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 16:43:23 +08:00
joylink_cuiweidong
d1eec65783 西安三号线 福州一号线 实训定义代码调整 2020-11-26 16:43:00 +08:00
fan
43c0de245d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:54:58 +08:00
fan
5abdfc9883 哈尔滨操作调整 2020-11-26 14:54:37 +08:00
joylink_cuiweidong
17e5f13202 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:39:15 +08:00
joylink_cuiweidong
5d02a56646 福州线路新版 操作调整 2020-11-26 14:37:48 +08:00
fan
b98ab0ae4b merge 2020-11-26 14:27:45 +08:00
fan
8b8b5bd028 哈尔滨操作调整 2020-11-26 14:26:35 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
fan
10d8b674b4 哈尔滨操作调整 2020-11-25 18:41:35 +08:00
joylink_cuiweidong
10c007e9cf 福州一号线/西安三号线 实训定义调整 2020-11-25 17:32:07 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
zyy
83e74cc53b 增加运行图客流量配置 2020-11-18 13:15:28 +08:00
fan
697dfdd365 样式调整 2020-11-16 10:11:07 +08:00
zyy
a752dcd2e5 调整路径配置，删除多余配置 2020-11-13 17:05:10 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
joylink_cuiweidong
d0421ff9fe 代码调整 2020-11-12 14:06:13 +08:00
fan
ffbb56ce57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-12 09:05:01 +08:00
fan
7e288934bc 张赛IP调整 2020-11-12 09:04:37 +08:00
joylink_cuiweidong
1a7a6e27c7 连挂操作代码调整 2020-11-11 18:49:32 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
fan
a0cf632380 排列进路调整 2020-11-11 13:31:46 +08:00
zyy
d34b528cd4 调整描述名称 2020-11-10 14:41:51 +08:00
zyy
81144131b8 调整右键区段操作 2020-11-10 13:55:49 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
zyy
8f1e38ce29 调整剧本显示，菜单显示 2020-11-06 14:11:16 +08:00
zyy
f3162dfbd8 调整场景描述位置，调整列车清空逻辑 2020-11-06 13:41:33 +08:00
joylink_cuiweidong
58e5635a72 教学实训操作定义代码调整 
运行图代码调整
 2020-11-06 11:04:38 +08:00
joylink_cuiweidong
fc46f0b55e 运行图 车次号方向代码调整 2020-11-04 18:35:27 +08:00
joylink_cuiweidong
8ff03944ce 哈尔滨教学实训代码调整 2020-11-04 16:14:41 +08:00
joylink_cuiweidong
d8ae05cb06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:38:01 +08:00
fan
5378a06f25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:39:35 +08:00
fan
22192206c4 设置头码车调整参数 2020-11-03 16:39:24 +08:00
joylink_cuiweidong
b9f71f75d9 添加剧本删除动作接口 
修改剧本编制样式
 2020-11-03 16:37:47 +08:00
zyy
eef7ccfba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:18:29 +08:00
zyy
4c00fa1a90 调整国赛运行图显示 2020-11-03 16:18:15 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整 
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
 2020-11-03 16:06:11 +08:00
joylink_cuiweidong
30c71d02fb 供电线故障代码调整 2020-11-02 18:51:53 +08:00
joylink_cuiweidong
cfdb7d3187 故障操作 添加手动开启屏蔽门 2020-11-02 17:54:25 +08:00
joylink_cuiweidong
d135c4cf10 成都三号线 菜单点击代码调整 
屏蔽门故障 添加 屏蔽门无法开启 故障
 2020-11-02 16:52:58 +08:00
zyy
e2fd8ea49e 调整菜单右键 2020-10-30 17:40:12 +08:00
joylink_cuiweidong
d58aa3b4f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:07:46 +08:00
joylink_cuiweidong
06b0360aa1 剧本编制代码调整 2020-10-30 15:06:05 +08:00
fan
95e010d046 报警状态调整 2020-10-30 14:41:42 +08:00
fan
8a92b5e448 报警状态调整 2020-10-30 14:39:38 +08:00
fan
4f567c474a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 14:15:12 +08:00
fan
7425506054 报警状态调整 2020-10-30 14:15:00 +08:00
zyy
b8c320fa5a Merge branch 'test-runPlan' into test 
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/planConvert.js
 2020-10-30 10:30:30 +08:00
fan
a402b72bb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 09:56:32 +08:00
fan
05a56d395b 个人信息展示单位&其他问题修复 2020-10-30 09:56:19 +08:00
zyy
dee76b4288 过滤空置 2020-10-29 18:37:51 +08:00
zyy
0abb974a95 恢复福州运行图加载 2020-10-29 18:23:56 +08:00
zyy
cbbba7b672 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 18:21:29 +08:00
zyy
ea29df1f69 调整福州二期地图导入 国赛运行图加载问题调整 2020-10-29 18:21:19 +08:00
fan
d82f969f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 16:58:26 +08:00
fan
f684eeb9a8 报警调整 2020-10-29 16:58:08 +08:00
lVAL
2f171e2355 修改折返站颜色 2020-10-29 16:47:00 +08:00
lVAL
c4d2f7ca23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 16:22:28 +08:00
lVAL
fcdf632123 修改AUSTool边缘移动Area的bug 2020-10-29 16:22:20 +08:00
fan
a6fab35450 添加计划车调整 2020-10-29 16:22:19 +08:00
fan
2eaba04ccd 添加计划车调整 2020-10-29 15:21:20 +08:00
fan
4a97343b3d merge 2020-10-29 14:43:23 +08:00
fan
1e745419a5 调整线路报警 2020-10-29 14:42:10 +08:00
lVAL
6071649e9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-29 14:38:04 +08:00
lVAL
be9c54ee34 修改AUSTool的bug 2020-10-29 14:37:51 +08:00
zyy
5c6d3695cb 调整国赛运行图轨迹流程 2020-10-29 10:20:52 +08:00
zyy
4d283fab04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:35:08 +08:00
zyy
b76f963a7b 调整国赛运行图流程 2020-10-28 18:34:53 +08:00
lVAL
48d53ad9a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:18:29 +08:00
lVAL
fe64262a67 修改AUSTool导出显示运行图错误 2020-10-28 18:18:22 +08:00
fan
3dcf6edde0 国赛皮肤调整 2020-10-28 16:32:45 +08:00
fan
ddf336579b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 15:19:17 +08:00
fan
45d8df8897 调整设置备用车位置 2020-10-28 15:18:57 +08:00
lVAL
7fe5e4992b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/api/rpTools.js
#	src/views/planMonitor/editToolAUS/tool/index.vue
 2020-10-28 15:04:51 +08:00
lVAL
5f48a7743e 增加AUS线路编辑功能，以及调整增加运行图组后的接口 2020-10-28 15:01:14 +08:00
fan
d6aa7b0c1d 哈尔滨加载备用车 2020-10-28 13:46:20 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
c660931d92 注释 2020-10-28 11:27:17 +08:00
fan
eb35221c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:11:48 +08:00
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
joylink_cuiweidong
433e839e75 Merge remote-tracking branch 'remotes/origin/master' into test 2020-10-28 10:36:18 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
fan
9dc3a4528d merge 2020-10-28 10:00:48 +08:00
fan
2509d11baf 代码调整 2020-10-28 10:00:04 +08:00
joylink_cuiweidong
e59ff1f39e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 09:35:19 +08:00
joylink_cuiweidong
3d18dbe9ca 删除暂时没用到的文件 
解决设置计划车 弹出的对话框 没有初始化的问题
 2020-10-28 09:35:02 +08:00
fan
1f955a2190 注释 2020-10-27 18:47:58 +08:00
fan
76bbc56825 哈尔滨报警 2020-10-27 18:43:04 +08:00
fan
85216079e4 理论调整 2020-10-27 17:00:00 +08:00
zyy
fdcbc79e34 成都一号线避免加载错误 2020-10-27 11:22:11 +08:00
joylink_cuiweidong
da1b5f27d1 代码调整 2020-10-26 13:59:17 +08:00
joylink_cuiweidong
f34092741b 竞赛 添加 道岔钩锁指令（非语音指令） 
删除不必要文件
 2020-10-26 13:51:53 +08:00
lVAL
fa8126ec34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:17:53 +08:00
joylink_cuiweidong
4842dca6f4 代码调整 2020-10-26 11:13:37 +08:00
joylink_cuiweidong
b1c2d74d29 代码调整 2020-10-26 11:08:16 +08:00
lVAL
773522b8f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 10:54:00 +08:00
lVAL
6111f07118 优化代码 2020-10-26 10:53:48 +08:00
joylink_cuiweidong
7cccb83a08 竞赛道岔区段添加取消临时限速操作 2020-10-26 10:39:44 +08:00
joylink_cuiweidong
f456e71a95 竞赛操作方式 由北京线路转换为宁波线路 2020-10-26 10:21:11 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
fan
c5a4dd68f3 添加设置计划车、设置头码车、设置人工车 2020-10-23 17:23:09 +08:00
lVAL
a32030695a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:15:51 +08:00
lVAL
5bc8be961d 优化代码 2020-10-23 16:15:39 +08:00
fan
a952ebeafe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:13:32 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加，AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
joylink_cuiweidong
7352193df1 代码调整 2020-10-22 14:29:55 +08:00
lVAL
457dd7381a 修改AUSTool 2020-10-22 10:28:38 +08:00
lVAL
c1050d16ab 修改AUSTool 功能 2020-10-21 18:36:52 +08:00
lVAL
50426cbb7a 修改AUSTool的功能 2020-10-20 17:47:47 +08:00
lVAL
c37bec7fa4 修改AUSTool 拖动车次的问题 2020-10-20 17:33:43 +08:00
lVAL
2fadaade87 增加车次号标签 2020-10-20 17:22:15 +08:00
lVAL
d3ea1cd22e 增加AUSTool绘制区域功能 2020-10-20 15:38:26 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
lVAL
dc7a5ab749 增加运行图编辑的功能 2020-10-19 18:39:19 +08:00
lVAL
58c7914e8b 修改激活不灵活的问题 2020-10-16 13:57:33 +08:00
lVAL
541a1cabe4 增加绘图新建功能 2020-10-16 13:07:31 +08:00
fan
330ae450f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-16 11:25:19 +08:00
fan
ed6651cc4c 触发故障菜单 2020-10-16 11:25:07 +08:00
lVAL
bbe9ca1e28 修改运行图操作 2020-10-16 10:50:07 +08:00
ival
891ff8362a AUS运行编辑功能完善 2020-10-15 22:57:06 +08:00
lVAL
df1fcc8f82 修改代码 2020-10-15 18:53:45 +08:00
lVAL
80fb7641ae 增加AUS运行图工具的代码 2020-10-15 16:05:30 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
fan
05740d7d57 方向杆问题调整 2020-10-13 09:36:48 +08:00
fan
fd00154f0c 宁波一取消临时限速 2020-10-12 18:53:04 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
a790971fb3 故障触发问题调整 2020-10-12 16:47:43 +08:00
fan
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
zyy
fdaf3eaa1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:41:10 +08:00
zyy
4b2939ff0a 调整区段配置 2020-09-15 17:40:57 +08:00
fan
b7a02f45c1 宁波三菜单 2020-09-14 18:34:56 +08:00
fan
40b12de294 会话调整 2020-09-11 17:57:48 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
fan
03d4a28ab6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 17:42:10 +08:00
fan
281bbc32f8 宁波三菜单调整&表单记录页数 2020-09-09 17:41:51 +08:00
fan
06ecb8dd1a 宁波三菜单调整 2020-09-09 14:45:38 +08:00
zyy
d6fba202b4 字段调整 2020-09-09 14:35:48 +08:00
zyy
d01f367e73 调整右键操作显示 2020-09-09 13:25:34 +08:00
zyy
83b1d16773 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 09:40:01 +08:00
zyy
fa70285ef9 调整西安二号线列车右键操作栏 2020-09-09 09:39:23 +08:00
fan
5ceaaed517 调整加载动画 2020-09-08 16:57:48 +08:00
fan
9d42aac8fa 调整宁波三菜单&调整加载动画 2020-09-08 16:41:38 +08:00
fan
cbb00efdcb 一键生成课程、试卷响应调整 2020-09-08 15:29:45 +08:00
fan
ebcc73cb2d 宁波三号线菜单调整&增加一键生成课程、试卷 2020-09-08 14:14:20 +08:00
fan
fadcb630ab 宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整 2020-09-08 09:49:49 +08:00
zyy
7f07fe898b 调整发送指令参数 2020-09-07 14:17:41 +08:00
zyy
7f434b2828 调整西安二号线列车右键显示 2020-09-07 14:04:44 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
18c74bb3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 11:28:25 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
4f1a2f03cb 哈尔滨盈达科技项目页添加 2020-09-07 11:08:26 +08:00
fan
5af9956f5b 佛山修改列车识别好调整 2020-09-04 17:57:37 +08:00
fan
dc085df977 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 17:21:46 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +08:00
joylink_cuiweidong
d328a11569 西安三号线 福州一号线新版 地图配置文件调整 2020-09-04 10:38:36 +08:00
joylink_cuiweidong
b6c39918e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 18:17:40 +08:00
joylink_cuiweidong
679d714b29 道岔绘图代码调整 2020-09-03 18:17:15 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
zyy
ab538b9bb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2020-09-03 14:22:44 +08:00
zyy
31eb1f8446 调整目的码接口 2020-09-03 14:17:52 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
joylink_cuiweidong
7044642105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:41:09 +08:00
joylink_cuiweidong
2ed40ee117 宁波一号线实训操作代码调整 2020-09-02 18:40:51 +08:00
fan
d40491fb41 merge 2020-09-02 18:06:48 +08:00
fan
3445f98618 宁波三号线菜单调整 2020-09-02 18:02:50 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式，增加目的码表单 2020-09-02 17:11:06 +08:00
joylink_cuiweidong
647897b2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 14:33:58 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
fan
5f04b0e25b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 10:18:28 +08:00
fan
dda0a719ba 宁波三菜单调整 2020-09-02 10:17:58 +08:00
joylink_cuiweidong
61d9f294d8 哈尔滨线路代码调整 2020-09-02 10:15:50 +08:00
fan
86c1dff4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:17:50 +08:00
fan
ecbb6a964f 接收重置仿真信息时清除活动列车 2020-09-02 09:17:27 +08:00
zyy
c93cff772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:09:38 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
fan
a5cbbcb3af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 17:11:24 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
joylink_cuiweidong
bcc92b6672 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 16:45:39 +08:00
joylink_cuiweidong
8a4d98612e 哈尔滨线路实训代码调整 2020-09-01 16:45:23 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
 2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
joylink_cuiweidong
c76205790a 宁波一号线实训操作代码调整 2020-08-31 15:58:55 +08:00
fan
246568175f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:28:32 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
joylink_cuiweidong
2637b952f3 代码调整 2020-08-31 10:31:36 +08:00
joylink_cuiweidong
b98039d5fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:13:39 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作，调整配置 2020-08-28 17:22:12 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整 
区段（parentCode）字段处理
 2020-08-28 16:52:19 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整 
剧本编制代码调整
 2020-08-28 14:43:30 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
fan
4c8e447d59 运行图参数调整 2020-08-28 13:16:14 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
deded7ed6e 宁波三号线菜单调整 2020-08-27 16:48:03 +08:00
zyy
06699507e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:13:29 +08:00
zyy
8a3287ca22 删除多余代码注释 2020-08-27 13:13:15 +08:00
fan
9dc290a550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 10:45:54 +08:00
fan
f2469920fe 菜单配置调整 2020-08-27 10:45:43 +08:00
fan
a01267abe1 区段切除报错调整 2020-08-27 10:45:06 +08:00
zyy
699053f46f 调整西安运行图流程 2020-08-27 09:56:00 +08:00
zyy
bbae7bfb1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:44:17 +08:00
zyy
fc14cc41a7 调整发布地图导出，调整大屏流程 2020-08-26 17:44:01 +08:00
fan
9fcb1cd9bb 代码调整 2020-08-25 18:50:42 +08:00
fan
932360dd88 merge 2020-08-25 17:10:08 +08:00
fan
f611f5057d 西安二菜单调整 2020-08-25 17:02:48 +08:00
joylink_cuiweidong
a9fd33c413 哈尔滨线路实训操作调整 2020-08-25 16:54:16 +08:00
joylink_cuiweidong
1668b25337 哈尔滨线路实训操作代码调整 2020-08-25 16:38:08 +08:00
joylink_cuiweidong
f2957c370c 哈尔滨线路实训操作代码调整 2020-08-25 15:09:04 +08:00
joylink_cuiweidong
2dad56ac07 哈尔滨线路实训操作调整 2020-08-25 15:01:47 +08:00
joylink_cuiweidong
5549b7bc9f 哈尔滨线路实训操作代码调整 2020-08-25 14:49:19 +08:00
joylink_cuiweidong
92ba51a548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 14:17:44 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
zyy
69f7b9deca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:51:42 +08:00
zyy
13160dfc91 增加西安二号线列车右键菜单 2020-08-25 13:51:27 +08:00
joylink_cuiweidong
9fc8948bba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:15:47 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整 
剧本录制页面聊天代码调整
 2020-08-25 13:15:32 +08:00
zyy
54720bc848 处理西安二号线列车冲突代码 2020-08-25 09:33:20 +08:00
zyy
1112ee8322 删除西安二号线列车多余菜单样式 2020-08-25 09:31:07 +08:00
fan
664e174fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 09:25:50 +08:00
fan
6a268fa095 宁波三菜单调整 2020-08-25 09:25:36 +08:00
joylink_cuiweidong
b1380e5e45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 19:18:31 +08:00
joylink_cuiweidong
8db06da732 哈尔滨线路操作代码调整 2020-08-24 19:18:12 +08:00
fan
009d911a75 merge 2020-08-24 18:27:09 +08:00