Commit Graph

623 Commits

Author SHA1 Message Date
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
fan
c13624b60a 西安二号线调整 2020-04-17 15:59:50 +08:00
fan
2100144656 西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整 2020-04-17 15:02:35 +08:00
fan
795ad48e32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:34:36 +08:00
fan
07711a5bda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:32:18 +08:00
zyy
4bd05891be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:31:12 +08:00
fan
a4097e1f32 西安二号线调整 2020-04-17 13:30:59 +08:00
zyy
b628df2d85 调整对象拷贝方式 2020-04-17 13:30:58 +08:00
joylink_cuiweidong
467e8671fd 西安二号线屏蔽门绘图调整 2020-04-17 13:30:18 +08:00
joylink_cuiweidong
126d9f2309 代码调整 2020-04-17 11:29:50 +08:00
fan
1168f6fd8a veu 告警调整 2020-04-17 10:54:02 +08:00
zyy
aa8ae83299 自动计算站间距离 2020-04-16 18:06:36 +08:00
joylink_cuiweidong
5fe37ec4e2 北京一号线 区段实训操作代码调整 2020-04-16 17:26:07 +08:00
zyy
bbe8dfabee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 17:09:36 +08:00
zyy
ceabc43f7d 增加站间距离字段 2020-04-16 17:09:23 +08:00
fan
3871ec173c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 15:54:11 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
joylink_cuiweidong
1c7a0461fe 北京一号线 站台实训操作代码调整 2020-04-16 15:50:04 +08:00
zyy
e027be4976 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 15:27:20 +08:00
zyy
9ea21f4b7a 调整侧防接口字段 2020-04-16 15:27:06 +08:00
joylink_cuiweidong
e88bdf8e0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 14:51:52 +08:00
joylink_cuiweidong
fc2d9c1ff7 草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
2020-04-16 14:50:40 +08:00
zyy
06c29aaced Merge branch 'master' into test
# Conflicts:
#	src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
2020-04-16 12:08:07 +08:00
zyy
a9e991f061 调整侧防流程 2020-04-16 12:06:36 +08:00
zyy
40021e34f4 调整侧防流程 2020-04-16 10:52:11 +08:00
zyy
35e6f6846e 调整侧防流程 2020-04-16 10:51:29 +08:00
fan
aae2a734ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 09:03:22 +08:00
fan
8e5a79626a 西安二号线调整 2020-04-16 09:01:52 +08:00
joylink_cuiweidong
eadcf233b1 设计平台 地图列表样式调整 2020-04-15 15:42:47 +08:00
joylink_cuiweidong
fec4e33719 实训平台和设计平台 地图列表代码调整 2020-04-15 15:06:51 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
joylink_cuiweidong
900b727fc4 新版地图数据校验文字调整 2020-04-15 09:37:42 +08:00
fan
2f6f75ff3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:52:19 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
joylink_cuiweidong
c6f532be4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:45:33 +08:00
joylink_cuiweidong
9ea5d7fdfb 新版地图信号机 区段前端校验 2020-04-14 18:45:14 +08:00
fan
4bbc0d648f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 15:46:36 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
joylink_cuiweidong
ba666eb334 实训平台教学 代码调整 2020-04-14 14:51:14 +08:00
zyy
feca56f94b 调整字段名称显示,调整佛山线路标注字段 2020-04-14 09:48:54 +08:00
zyy
bd8c631d45 调整进路保存侧防列表字段 2020-04-13 19:13:52 +08:00
zyy
64279ed484 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 18:59:19 +08:00
zyy
b7edbc8697 侧防列表更新 2020-04-13 18:59:01 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
fan
20491dac81 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:13:52 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
zyy
2dc975ef7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:04:01 +08:00
zyy
df92090509 增加配置中侧防数据,调整接口 2020-04-13 17:03:48 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
joylink_zyy
826504d9c7 调整考试系统哈尔滨 现地不能操作 2020-04-11 11:20:22 +08:00