Commit Graph

1644 Commits

Author SHA1 Message Date
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