drone/drone-web-manage.git

无人机管理后台前端（已迁走）

Merge branch 'feature/v7.0/7.0.1' into prod

罗广辉

2025-10-17 1c326c20f634590ad05265d5de5090be15d27231

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Friday, October 17, 2025 18:02 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Friday, October 17, 2025 18:02 +0800
commit	1c326c20f634590ad05265d5de5090be15d27231
tree	40408fcae5ee091697b6e350ae06495e3f0601ab tree \| zip \| gz
parent	8bfd657326eb9d4bd9b63920cfe3bd362cea4445 view \| diff fb83485ab14cdf80ce394ab3e7d38a9dd8439516 view \| diff

Merge branch 'feature/v7.0/7.0.1' into prod

# Conflicts:
#	src/views/tickets/ticket.vue

39 files modified

	src/api/system/menu.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/api/system/role.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/api/user.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/components/CreateQRcode/CreateQRcode.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/option/job/jobinfo.js	7 ●●●●● diff \| view \| raw \| blame \| history
	src/option/job/jobserver.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/option/system/dict.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/option/system/dictbiz.js	8 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/user.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/element-ui.scss	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/algorithmMange/algorithmMange.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/algorithmRepository/algorithmRepository.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/authority/apiscope.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/authority/datascope.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/authority/role.vue	29 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dataCenter/components/searchData.vue	35 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/addDevice.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/airport.vue	143 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/firmwareManage.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/devicePerMenu.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/api.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/error.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/flightLog.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/odm/task.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/attach.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/media.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/oss.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/patchManagement.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/patchTypeManagement.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/wayline.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/waylineFile.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/client.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/dept.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/menu.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/param.vue	44 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/sysConfig.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/user.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/orderLog.vue	446 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/ticket.vue	474 ●●●●● diff \| view \| raw \| blame \| history