zyy 5bb54b07cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test ... # Conflicts: # src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue # src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue # src/jmapNew/theme/xian_01/menus/menuSignal.vue		2020-06-18 14:59:43 +08:00
..
menus	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test	2020-06-18 14:59:43 +08:00
model.js	跳停上下行取值调整&列车识别号显示调整	2020-06-12 10:51:06 +08:00
operationConfig.js	调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关	2020-06-04 14:21:19 +08:00
planConvert.js	调整绘图逻辑，增加哈尔滨线路 站台 信号机绘图逻辑	2020-02-03 17:17:56 +08:00