ival 67cf6f5a29 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev ... # Conflicts: # src/i18n/langs/en/orderAuthor.js # src/i18n/langs/en/rules.js # src/i18n/langs/zh/orderAuthor.js # src/i18n/langs/zh/rules.js # src/views/orderauthor/commodity/index.vue # src/views/orderauthor/order/draft.vue		2019-08-19 18:49:40 +08:00
..
components	desc: 修改地图编辑页面逻辑	2019-08-16 15:12:03 +08:00
dashboard	界面调整	2019-08-19 09:15:25 +08:00
demonstration	Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev	2019-08-19 14:09:54 +08:00
display	Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev	2019-08-19 18:25:58 +08:00
error-page	增加nclient工程	2019-07-02 16:29:52 +08:00
exam	修改实训加载顺序错误的问题	2019-08-19 15:59:04 +08:00
jlmap	修改皮肤skinStyle为skinCode	2019-08-14 09:35:38 +08:00
jlmap3d	desc: 修改地图编辑页面逻辑	2019-08-16 15:12:03 +08:00
jmapTest	Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient	2019-07-25 10:35:10 +08:00
jointTraining	修改格式，以及修改综合演练设置车站的stationCode为deviceCode	2019-08-16 15:41:20 +08:00
lesson	修改实训加载顺序错误的问题	2019-08-19 15:59:04 +08:00
login	修改代码	2019-08-05 15:12:06 +08:00
management	修改字典菜单的国际化	2019-08-19 18:42:53 +08:00
map	Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev	2019-08-19 16:39:20 +08:00
mapsystem	同步master代码以及修改交路的问题	2019-08-14 16:37:17 +08:00
orderauthor	Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev	2019-08-19 18:49:40 +08:00
package	修改接口	2019-08-14 14:01:28 +08:00
planMonitor	desc: 修改琏计划运行图创建加载	2019-08-16 17:13:12 +08:00
publish	修改地图导入导出	2019-08-16 16:28:11 +08:00
replay	修改皮肤skinStyle为skinCode	2019-08-14 09:35:38 +08:00
screenMonitor	修改皮肤skinStyle为skinCode	2019-08-14 09:35:38 +08:00
scriptManage	定时保存数据	2019-08-19 14:09:08 +08:00
teach	修改实训加载顺序错误的问题	2019-08-19 15:59:04 +08:00
trainRoom	国际化处理	2019-08-19 14:02:20 +08:00