fan 5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev ... # Conflicts: # src/components/QueryListPage/QueryForm.vue # src/i18n/langs/en/rules.js # src/i18n/langs/en/scriptRecord.js # src/i18n/langs/zh/lesson.js # src/i18n/langs/zh/rules.js # src/i18n/langs/zh/scriptRecord.js # src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue # src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue # src/permission.js # src/router/index.js # src/utils/baseUrl.js # src/views/demonstration/detail/index.vue # src/views/display/tipExamList.vue # src/views/lesson/lessoncategory/edit/lesson/publish.vue # src/views/lesson/taskmanage/createTask.vue # src/views/lesson/trainingRule/list.vue # src/views/login/index.vue # src/views/planMonitor/editTool/statusBar.vue # src/views/scriptManage/home.vue # src/views/teach/category/tree.vue # src/views/trainRoom/index.vue		2019-10-17 09:16:40 +08:00
..
menus	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
index.vue	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
menuBar.vue	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
menuTool.vue	desc: 调整冲突, 增加导入运行图国际化	2019-09-19 17:34:04 +08:00
schedule.vue	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
statusBar.vue	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
titleBar.vue	desc: 修改琏计划界面样式，修改界面交互	2019-08-13 15:54:26 +08:00
userindex.vue	运行图增加计划和删除计划 更新运行图数据	2019-10-14 15:35:11 +08:00