zyy b5b9f4c1ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev ... # Conflicts: # src/i18n/langs/en/rules.js # src/i18n/langs/en/tip.js # src/i18n/langs/zh/rules.js # src/i18n/langs/zh/tip.js # src/views/planMonitor/editTool/menuBar.vue # src/views/planMonitor/editTool/menus/createEmptyPlan.vue # src/views/planMonitor/editTool/menus/editPlanName.vue # src/views/planMonitor/editTool/menus/modifyingTask.vue # src/views/planMonitor/editTool/menus/openRunPlan.vue		2019-09-19 17:28:31 +08:00
..
api	desc: 新增创建权限流程	2019-09-18 18:39:55 +08:00
assets	ibp修改扶梯框边框宽度，调整select默认状态	2019-09-10 10:16:02 +08:00
components	国际化调整	2019-09-17 17:53:42 +08:00
i18n	Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev	2019-09-19 17:28:31 +08:00
ibp	desc: 调整绘图逻辑，流程，字段显示	2019-09-12 16:30:42 +08:00
icons	修改格式问题	2019-08-08 14:32:32 +08:00
jlmap3d	修改三维界面声音返回和退出播放bug，更换音轨	2019-09-18 13:20:08 +08:00
jmap	desc: 调整权限国际化，调整琏计划导入运行图逻辑	2019-09-19 17:22:48 +08:00
layout	App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入	2019-09-02 15:37:57 +08:00
mixin	增加录制脚本页面布局	2019-08-20 12:47:39 +08:00
router	pull	2019-09-17 13:16:49 +08:00
scripts	国际化调整	2019-09-19 13:19:35 +08:00
store	desc: 调整绘图逻辑，流程，字段显示	2019-09-12 16:30:42 +08:00
styles	修改类车添加功能	2019-08-14 13:38:28 +08:00
utils	desc: 调整权限国际化，调整琏计划导入运行图逻辑	2019-09-19 17:22:48 +08:00
views	Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev	2019-09-19 17:28:31 +08:00
App.vue	App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入	2019-09-02 15:37:57 +08:00
directives.js	代码移植	2019-07-26 13:32:43 +08:00
main.js	修改elementUi切换中英文不成功的问题	2019-08-30 18:20:07 +08:00
permission.js	代码移植	2019-07-26 13:32:43 +08:00
settings.js	desc: 修改eslint 配置 保存	2019-07-04 10:59:40 +08:00