jagzwxm/ja_web.git

Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 cabb1279e9370edfebdef62f6eba272eeae8fe67

refs
author	张含笑 <zhx18749296735@163.com>
	Friday, January 23, 2026 18:10 +0800
committer	张含笑 <zhx18749296735@163.com>
	Friday, January 23, 2026 18:10 +0800
commit	cabb1279e9370edfebdef62f6eba272eeae8fe67
tree	ac425b5e3e101779b689f3fb69aaa6fa5739de70 tree \| zip \| gz
parent	cc920a120bc50a0e25c0fba9e6f9f56c3f346e2a view \| diff 5c925f9d963af25f1663383ef173d16c5b5e8a43 view \| diff

Merge remote-tracking branch 'origin/master'

35 files modified

5 files added

	applications/drone-command/env/.env.development	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/assets/images/dataCockpit/favorite-n.png	diff \| view \| raw \| blame \| history
	applications/drone-command/src/assets/images/dataCockpit/favorite-y.png	diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/components/DevicePopup.vue	325 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/components/DronePopup.vue	323 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/device-map-container.vue	565 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/device-map-materials.js	188 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue	2 ●●●●● 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	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue	2 ●●●●● 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/dataCockpit/components/templateComponents/RealTemplate.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/taskSchedule/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionDept/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/common/cockpit.scss	352 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue	24 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue	253 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history