Commit Graph

8323 Commits

Author SHA1 Message Date
joylink_cuiweidong
2b51f077fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 17:00:13 +08:00
joylink_cuiweidong
387ad98a90 场景编辑代码调整 2020-11-11 16:59:58 +08:00
zyy
b0f2e8d8ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 16:56:53 +08:00
zyy
866bf2414b 调整实操菜单 2020-11-11 16:56:38 +08:00
joylink_cuiweidong
cc514e7ee1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 16:40:21 +08:00
joylink_cuiweidong
e2eae2945b 运行图编制代码调整 2020-11-11 16:40:07 +08:00
lVAL
c76d8309cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 16:13:55 +08:00
lVAL
74919a6b81 data2json 过滤 列车数据 的两行错误数据 2020-11-11 16:13:48 +08:00
zyy
b539d54a6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 16:09:58 +08:00
zyy
286acf7348 调整剧本场景编辑 2020-11-11 16:09:43 +08:00
lVAL
15194a5e8f 增加打印信息 2020-11-11 16:00:47 +08:00
lVAL
b1702506cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 15:55:17 +08:00
lVAL
f4b0ad47ed 修改 data2json 中输出格式的问题 2020-11-11 15:55:05 +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
joylink_cuiweidong
f02a084bc8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 14:36:28 +08:00
joylink_cuiweidong
72ca1a24b2 运行图编制代码调整 2020-11-11 14:36:11 +08:00
fan
147848cfed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 13:32:04 +08:00
fan
a0cf632380 排列进路调整 2020-11-11 13:31:46 +08:00
joylink_cuiweidong
f628e2b486 会话代码调整 2020-11-11 13:13:27 +08:00
joylink_cuiweidong
dee6c30f2f 运行图编制代码调整 2020-11-11 11:22:26 +08:00
joylink_cuiweidong
5012f9ce58 代码调整 2020-11-11 09:13:41 +08:00
joylink_cuiweidong
23a59be2c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 18:41:19 +08:00
joylink_cuiweidong
4d5d8f1fdc 哈尔滨仿真 运行图编辑代码调整 2020-11-10 18:41:02 +08:00
lVAL
9b4039daab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 18:25:29 +08:00
lVAL
34fa80f4f8 解析excel数据,上传系统 2020-11-10 18:25:13 +08:00
fan
2a4d931e09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 18:19:08 +08:00
fan
0f6af4d835 动态列车list数据处理调整 2020-11-10 18:18:48 +08:00
joylink_cuiweidong
d6c55ad016 修改角色 车辆段 为 车辆段信号楼 2020-11-10 16:20:03 +08:00
joylink_cuiweidong
4733f3d2fd 代码调整 2020-11-10 15:37:04 +08:00
fan
3eba44aa67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 15:17:48 +08:00
fan
c89302868b 列车驾驶故障 2020-11-10 15:17:25 +08:00
joylink_cuiweidong
42f8c93689 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 14:58:14 +08:00
joylink_cuiweidong
d929c3d7b5 代码调整 2020-11-10 14:57:58 +08:00
zyy
2d43bd3115 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 14:42:07 +08:00
zyy
d34b528cd4 调整描述名称 2020-11-10 14:41:51 +08:00
joylink_cuiweidong
65c3de9288 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 14:08:41 +08:00
joylink_cuiweidong
ee3cb6e04f 指令字典生成 代码调整 2020-11-10 14:08:24 +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
31b45c3c9d 删除断点 2020-11-09 18:28:40 +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
joylink_cuiweidong
110ff2b1c2 仿真退出 重置状态 代码调整
删除无用的文件
2020-11-09 16:15:20 +08:00
joylink_cuiweidong
b439232fef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 15:17:31 +08:00
joylink_cuiweidong
8d14c93231 仿真代码调整 2020-11-09 15:17:11 +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