joylink_cuiweidong d2f653bc54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test ... # Conflicts: # src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue # src/jmapNew/theme/haerbin_01/menus/menuTrain.vue # src/jmapNew/theme/xian_01/menus/menuTrain.vue # src/jmapNew/theme/xian_02/menus/menuTrain.vue		2020-07-13 18:59:56 +08:00
..
api	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test	2020-07-13 10:16:07 +08:00
assets	设备登录调整	2020-07-08 17:36:32 +08:00
components	故障操作代码调整	2020-07-01 11:27:09 +08:00
directive	故障操作代码调整	2020-07-02 10:10:16 +08:00
i18n	试卷规则bug修复&哈尔滨操作调整	2020-07-13 16:48:23 +08:00
ibp	调整iscs 鼠标事件流程	2020-06-09 13:24:18 +08:00
icons
iscs	iscs 转换函数代码调整	2020-06-28 15:27:10 +08:00
jlmap3d	修改三维驾驶录制获取驾驶员托管状态接口	2020-07-10 14:47:52 +08:00
jmap	删除老板本成都4、3 北京1 线路配置	2020-06-19 13:56:46 +08:00
jmapNew	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test	2020-07-13 18:59:56 +08:00
layout	旧地图综合演练调整	2020-07-13 14:34:56 +08:00
mixin	调整设置app/height 执行顺序问题	2020-04-28 14:49:42 +08:00
router	删除多余配置	2020-07-10 18:41:29 +08:00
scripts	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test	2020-07-13 18:59:56 +08:00
store	旧地图综合演练调整	2020-07-13 14:34:56 +08:00
styles
utils	增加所有线路列车故障模式	2020-07-13 17:27:33 +08:00
views	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test	2020-07-13 18:40:53 +08:00
App.vue	旧地图综合演练调整	2020-07-13 14:34:56 +08:00
main.js	添加题库管理流程	2020-05-26 15:59:11 +08:00
permission.js	哈尔滨操作调整	2020-07-13 13:01:28 +08:00
settings.js