jagzwxm/ja_web.git

吉安感知网项目-前端

Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-20 bcbcc546577c7c6643e7f0d4ac366f8a013bd306

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Tuesday, January 20, 2026 13:47 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Tuesday, January 20, 2026 13:47 +0800
commit	bcbcc546577c7c6643e7f0d4ac366f8a013bd306
tree	a49ccc16f035e680f1dc94f0b570b3a1f2f9ccc8 tree \| zip \| gz
parent	7a2e48bf8ca408d09348b837407aa9b14c99b603 view \| diff 09e475fb52f82b5fd8355781644ef32abfad2bd8 view \| diff

Merge remote-tracking branch 'origin/master'

33 files modified

2 files added

	applications/drone-command/public/fonts/DinAB.TTF	diff \| view \| raw \| blame \| history
	applications/drone-command/public/fonts/font.css	7 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/device-map-container.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/mac/index.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/page/index/top/top-full.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/page/lock/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/page/login/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/styles/common/cockpit.scss	32 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/utils/cesium/DrawPolygon.js	1 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/utils/util.js	25 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCenter/components/dataCenterMap.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/CenterContainer.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/RightContainer.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/templateComponents/RealTemplate.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/taskSchedule/FormDiaLog.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/job/jobinfo.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/layerManagement/components/utils.js	1 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/layerManagement/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionDept/FormDiaLog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/recordManage/historyTracks/index.vue	33 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue	607 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue	91 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/supplyAddApi.js	9 ●●●●● diff \| view \| raw \| blame \| history