Commit Graph

1941 Commits

Author SHA1 Message Date
joylink_cuiweidong
1a7a6e27c7 连挂操作代码调整 2020-11-11 18:49:32 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
zyy
d1a5c3670f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 15:34:38 +08:00
zyy
62a756f521 调整格式 2020-11-11 15:34:24 +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
488a452bce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 13:42:45 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
joylink_cuiweidong
f62fc8bbb3 指令字典生成 代码调整 2020-11-10 11:07:20 +08:00
zyy
35b3d115fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 18:25:08 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
lVAL
87b19773e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 13:01:11 +08:00
lVAL
779f76d4ec 1.优化修改data中的model属性,其他计算data中设别列表没有更新的问题
2.修改激活状态点击修改后,未重置激活态的问题。
2020-11-09 13:01:00 +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
fan
2c79a2bce0 merge 2020-11-04 16:42:29 +08:00
fan
08a306f373 剧本条件调整 2020-11-04 16:41:01 +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
fb09155f34 接触网 绘图状态代码调整 2020-11-03 09:55: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
dff3b6b105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:53:59 +08:00
joylink_cuiweidong
d135c4cf10 成都三号线 菜单点击代码调整
屏蔽门故障 添加 屏蔽门无法开启 故障
2020-11-02 16:52:58 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
b26f3044dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:12:29 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
fan
9ace3fc66f 绘图问题调整 2020-11-02 14:03:13 +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