Commit Graph

2394 Commits

Author SHA1 Message Date
zyy
db7acfd6c7 调整区段字段显隐 2020-04-10 10:10:44 +08:00
fan
5c55261f55 本地导入调整 2020-04-10 09:09:06 +08:00
fan
9f5644ccc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:57:03 +08:00
fan
1e4b7bbfd9 本地导入 2020-04-09 18:54:22 +08:00
zyy
e519aee3e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:39:42 +08:00
zyy
9b68feaba5 调整区段字段显隐判断 2020-04-09 18:39:27 +08:00
fan
991fa86ede Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:23:35 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
fan
47e692d3a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:52:19 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
joylink_cuiweidong
3db904a75e 代码调整 2020-04-09 16:45:34 +08:00
fan
0adcf6dac1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:14:29 +08:00
fan
79f473ad8b 实训管理老地图处理(未完) 2020-04-09 16:11:36 +08:00
zyy
184ff9d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 15:21:57 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理(未完) 2020-04-09 14:47:44 +08:00
zyy
15df2687c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 13:45:18 +08:00
zyy
b6d03d24a8 调整区段绘制方式 2020-04-09 13:45:01 +08:00
joylink_cuiweidong
bcca3c5858 一键生成实训代码调整 2020-04-09 09:42:35 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +08:00
joylink_cuiweidong
2ddd132327 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 09:23:25 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
fan
88bb30c413 实训管理调整(tabel 实训类型和操作不显示) 2020-04-08 18:47:48 +08:00
joylink_cuiweidong
4154b4ce20 系统指令字典添加 产品类型 参数 2020-04-08 15:59:49 +08:00
fan
b723628d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:33:45 +08:00
fan
5bd90ea0d1 实训操作类型筛选调整 2020-04-08 15:32:35 +08:00
joylink_cuiweidong
053648e0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:29:16 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
zyy
14e4c2c785 调整 框选设置元素 设备集中站流程 2020-04-08 15:20:29 +08:00
fan
df0d560df8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:25:27 +08:00
fan
02d4b8f71f 进路复制 2020-04-08 14:24:11 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/OperationConfig.js
2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
zyy
a27ee1e859 调整一键生成实训延迟显示 2020-04-08 10:42:06 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
joylink_cuiweidong
778d74ecd5 北京一号线现地 道岔 站台实训操作步骤代码调整 2020-04-07 17:19:28 +08:00
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
zyy
f26eea8f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:19:34 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
fan
87ddad535b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 14:41:38 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
zyy
1f6b627768 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 13:38:28 +08:00