drone/drone-web-manage.git

Merge remote-tracking branch 'origin/test' into test

linwei

2025-11-05 c48eafe8411adad734b57b424f5440284dbc85e3

refs
author	linwei <872216696@qq.com>
	Wednesday, November 5, 2025 16:15 +0800
committer	linwei <872216696@qq.com>
	Wednesday, November 5, 2025 16:15 +0800
commit	c48eafe8411adad734b57b424f5440284dbc85e3
tree	772142a5d4ed8b964c2ae8866a60a8ecb8486295 tree \| zip \| gz
parent	a9cd0421865126a2efbc7d1a26b8cd5f66507580 view \| diff 979fdae045e11950bee33391978b7f6ec12c3595 view \| diff

Merge remote-tracking branch 'origin/test' into test

76 files modified

1 files renamed

20 files added

	.env.development	5 ●●●●● diff \| view \| raw \| blame \| history
	.env.localhost	2 ●●●●● diff \| view \| raw \| blame \| history
	.env.production	2 ●●●●● diff \| view \| raw \| blame \| history
	.env.test	2 ●●●●● diff \| view \| raw \| blame \| history
	src/App.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/api/algorithmMange/algorithmMange.js	17 ●●●●● diff \| view \| raw \| blame \| history
	src/api/layer/index.js	109 ●●●●● diff \| view \| raw \| blame \| history
	src/api/logs.js	60 ●●●●● diff \| view \| raw \| blame \| history
	src/api/resource/wayline.js	8 ●●●●● diff \| view \| raw \| blame \| history
	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/assets/images/layerManagement/cancelbtn.svg	24 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/images/layerManagement/newcon_box.png	diff \| view \| raw \| blame \| history
	src/assets/images/layerManagement/savebtn.svg	23 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/images/mh.svg	7 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/images/task/sign.svg	3 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/images/warn.svg	10 ●●●●● diff \| view \| raw \| blame \| history
	src/components/CreateQRcode/CreateQRcode.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/components/commonDialog.vue	48 ●●●●● diff \| view \| raw \| blame \| history
	src/hooks/common.js	52 ●●●●● diff \| view \| raw \| blame \| history
	src/hooks/useRouteLine/useRouteLine.js	24 ●●●●● diff \| view \| raw \| blame \| history
	src/option/job/jobinfo.js	7 ●●●●● diff \| view \| raw \| blame \| history
	src/option/job/jobserver.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/option/system/dict.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/option/system/dictbiz.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/GlobalWS.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/index.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/tags.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/top/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/page/index/useGlobalWS.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/common.js	14 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/user.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/common.scss	4 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/element-ui.scss	762 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/mapEdit.scss	59 ●●●●● diff \| view \| raw \| blame \| history
	src/types/device-cmd.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/cesium/publicCesium.js	28 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/geoParseUtil.js	94 ●●●●● diff \| view \| raw \| blame \| history
	src/views/algorithmMange/algorithmMange.vue	304 ●●●●● diff \| view \| raw \| blame \| history
	src/views/algorithmRepository/algorithmRepository.vue	314 ●●●●● 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/dataCenterMap.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dataCenter/components/searchData.vue	51 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dataCenter/dataCenter.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/addDevice.vue	168 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/airport.vue	657 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/DeviceSettingBox.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/DockControlPanel.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/devicePerShare.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/firmwareManage.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/devicePerMenu.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/fly.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/DeviceJobDetails.vue	34 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/JobRelatedEvents.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/SearchBox.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue	17 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/TaskTop/TaskEvent.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/TaskTop/TaskIndustry.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/job/components/TaskTop/TaskTime.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/components/folderFile.vue	310 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/components/leftList.vue	463 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/components/nationalSpatialPlanning.vue	49 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/components/rightEdit.vue	420 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/components/utils.js	651 ●●●●● diff \| view \| raw \| blame \| history
	src/views/layerManagement/index.vue	487 ●●●●● diff \| view \| raw \| blame \| history
	src/views/license/license.vue	15 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/api.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/error.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/monitor/log/flightLog.vue	529 ●●●●● 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/components/DrawPolygon.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/components/spotDetails.vue	304 ●●●●● 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	15 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/patchTypeManagement.vue	24 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/wayline.vue	12 ●●●●● 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	103 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/helpCenter.vue	88 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/menu.vue	19 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/param.vue	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/sysConfig.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/user.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/userinfo.vue	63 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/orderLog-copy1.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/orderLog.vue	1505 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/ticket.vue	570 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wel/components/backlog.vue	29 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wel/components/proportionStatic.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wel/components/statistics.vue	244 ●●●●● diff \| view \| raw \| blame \| history
	src/views/workspace/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history