Commit Graph

9584 Commits

Author SHA1 Message Date
lVAL
7c80fc77c6 修改代码 2021-02-02 10:25:21 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
ef8066f9ef 修改分页查询 表单显示 2021-02-02 09:13:14 +08:00
lVAL
cb7ae5fe6b 线路:宁波3
问题:实训提示描述
2021-02-02 09:09:11 +08:00
lVAL
231898af92 增加指令产品类型展示。 2021-02-02 09:04:06 +08:00
lVAL
6be29c157b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:36:20 +08:00
lVAL
0a2f2b08b3 增加信号机和站台 显示 2021-02-01 18:36:07 +08:00
fan
07efc9ae51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:31:23 +08:00
fan
fa384b79ee 代码调整 2021-02-01 18:31:09 +08:00
joylink_cuiweidong
077457a4ac 西安二号线 添加帮助 操作定义 2021-02-01 18:11:58 +08:00
lVAL
26a82237b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 17:56:15 +08:00
lVAL
7095f145c9 增加 西安02 的信号机帮助和站台帮助实训 2021-02-01 17:56:03 +08:00
joylink_cuiweidong
def8b44d97 佛山 宁波 竞赛 车站操作 调整 2021-02-01 15:23:45 +08:00
joylink_cuiweidong
2ad9f691bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:38:09 +08:00
joylink_cuiweidong
2aadda7606 福州一号线 实训 操作定义 代码调整 2021-02-01 14:37:52 +08:00
fan
900a858010 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:31:28 +08:00
fan
8982177e99 代码调整 2021-02-01 14:31:16 +08:00
lVAL
811bf75a8e 注释掉 实训和指令发送中的log 2021-02-01 13:49:48 +08:00
lVAL
9071ce93e9 线路:南京2
问题:行调 交出控制、接受控制实训流程问题
2021-02-01 13:46:59 +08:00
lVAL
2e890a378c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 13:44:14 +08:00
lVAL
f0e3ee1f49 线路:南京2
问题:修改现地 强制站控,交出控制权,接受控制的实训流程。
2021-02-01 13:43:48 +08:00
joylink_cuiweidong
c4619c0784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 11:24:14 +08:00
joylink_cuiweidong
7818a149c4 福州一号线 道岔计轴预复位 操作定义调整 2021-02-01 11:23:37 +08:00
fan
e0245e4cbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 10:19:07 +08:00
fan
143f517097 卡斯柯 紧急站控实训调整 2021-02-01 10:18:54 +08:00
lVAL
ad385fbe97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 18:37:37 +08:00
lVAL
0598e48b42 修改宁波线状态刷新 2021-01-29 18:37:10 +08:00
joylink_cuiweidong
7e173b4c4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:32:09 +08:00
joylink_cuiweidong
8c4f24f9e2 bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整 2021-01-29 17:31:48 +08:00
fan
96256020c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:17:50 +08:00
fan
39e7cb83b9 南京二选中区段调整 2021-01-29 17:17:41 +08:00
lVAL
8c25f274f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 16:21:35 +08:00
lVAL
fa5b6027d3 删除无用打印 2021-01-29 16:21:19 +08:00
fan
22ac51f595 国赛购买调整描述 2021-01-29 16:20:18 +08:00
fan
216e8f0f19 国赛购买调整 2021-01-29 16:15:24 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
fan
84a438a74d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 15:01:50 +08:00
fan
318d120db6 BUG 107: 浙大网新仿真线路:对立的功能应设置有误 2021-01-29 15:01:38 +08:00
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
joylink_cuiweidong
3175321085 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:24:07 +08:00
joylink_cuiweidong
2e3d576614 生成联锁添加配置项:信号机接近区段不跨过前方同向信号机 2021-01-29 11:23:01 +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
fan
dadeca50fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 10:04:07 +08:00
fan
009f3981ff BUG 153:课程设计实训管理:操作类型查询不可更换,更换后显示无数据 2021-01-29 10:03:49 +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