Commit Graph

14 Commits

Author SHA1 Message Date
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
c35cef4800 样式调整 2019-11-11 18:42:14 +08:00
fan
04ec094ded 样式调整 2019-11-11 13:34:35 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
fan
00dcbdf7bd 任务管理调整 2019-10-30 19:36:26 +08:00
zyy
df8d104bd1 desc: 高度修改,登陆页面英文调整 2019-10-29 17:33:11 +08:00
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
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
fan
5075e999b9 设计平台调整 2019-09-30 16:20:31 +08:00
sunzhenyu
d7efef41e4 pull 2019-08-29 17:16:33 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00