jagzwxm/ja_web.git

吉安感知网项目-前端

Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-27 7319ec49da9f1490ad35f47e0da62546d1cc7ff4

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Tuesday, January 27, 2026 18:05 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Tuesday, January 27, 2026 18:05 +0800
commit	7319ec49da9f1490ad35f47e0da62546d1cc7ff4
tree	7ff62cde26da269d345f808e17ba5b608d7d24d3 tree \| zip \| gz
parent	5b1d81617e17acf52c1b8c01ce2cab753f4d75a4 view \| diff 6c7cdb644f765cdb4ad923095a36550b7d46e91d view \| diff

Merge remote-tracking branch 'origin/master'

29 files modified

2 files added

	applications/drone-command/src/components/map-container/device-map-container.vue	343 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/utils/cesium/DrawPolygon.js	24 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/areaManage/partition/index.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue	57 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue	35 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/RealWarning.vue	130 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/index.vue	113 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionDept/FormDiaLog.vue	31 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/permissionManage/permissionRole/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/common/cockpit.scss	24 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue	36 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue	58 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue	98 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue	316 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue	337 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/zoningManagement/zoningApi.js	66 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/subPackages/workDetail/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/pages/equipmentManagement/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/pages/legalPolicy/index.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/deviceRegistration/add.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/deviceRegistration/details.vue	54 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/add.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/details.vue	52 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history