jagzwxm/ja_web.git

Merge remote-tracking branch 'origin/master'

chenyao

2026-01-27 a4201c87e9428d230d3778a940c2cbb114efd89a

refs
author	chenyao <1219716595@qq.com>
	Tuesday, January 27, 2026 08:45 +0800
committer	chenyao <1219716595@qq.com>
	Tuesday, January 27, 2026 08:45 +0800
commit	a4201c87e9428d230d3778a940c2cbb114efd89a
tree	d6310c97b042bda1e9532b140d64b48ee35e7f75 tree \| zip \| gz
parent	972bc2b76d535e13c942abf6d90360ca8bb20ef4 view \| diff d06905ef483ffb271ed2d058dd21f81d3ed9f394 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	applications/task-work-order/src/views/orderView/flyingHand/index.vue

54 files modified

16 files added

	applications/drone-command/env/.env.development	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.ttf	diff \| view \| raw \| blame \| history
	applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff	diff \| view \| raw \| blame \| history
	applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff2	diff \| view \| raw \| blame \| history
	applications/drone-command/src/api/dataCockpit/index.js	28 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/device-map-container.vue	126 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/components/map-container/device-map-materials.js	40 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/config/iconList.js	7 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/styles/common.scss	1 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/styles/customFont.scss	60 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/api.txt	127 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/basicManage/deviceStock/index.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/LegendBar.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/RealWarning.vue	63 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/dataCockpit/components/templateComponents/RealEquipmentTemplate.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/mobile-web-view/src/appComponents/workMap/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/mobile-web-view/src/appPages/work/workDetail/mapWork/index.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/env/.env	3 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/env/.env.development	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.ttf	diff \| view \| raw \| blame \| history
	applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff	diff \| view \| raw \| blame \| history
	applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff2	diff \| view \| raw \| blame \| history
	applications/task-work-order/src/api/zkxt/index.js	17 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/assets/images/common/checkbox.png	diff \| view \| raw \| blame \| history
	applications/task-work-order/src/assets/images/common/n-checkbox.png	diff \| view \| raw \| blame \| history
	applications/task-work-order/src/assets/images/menuIcon/order-manage.png	diff \| view \| raw \| blame \| history
	applications/task-work-order/src/components/map-container/common-cesium-map.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/config/iconList.js	7 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/common.scss	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/common/cockpit.scss	391 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/customFont.scss	60 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/styles/tags.scss	13 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue	17 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue	67 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue	19 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/clueEvents/DistributeDiaLog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue	80 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue	136 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue	294 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue	152 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/orderManage/orderManageApi.js	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue	181 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/agenciesManagement/agenciesApi.js	66 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue	336 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/organizationalMessage/agenciesManagement/agenciesApi.js	66 ●●●●● diff \| view \| raw \| blame \| history
	pnpm-lock.yaml	72 ●●●●● diff \| view \| raw \| blame \| history
	pnpm-workspace.yaml	4 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/api/map.js	8 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/pages/map/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/pages/work/index.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/store/modules/location.js	34 ●●●●● diff \| view \| raw \| blame \| history