From 24bd2c892ed8ae37c2da677984bf7fddb861589f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 31 Jan 2026 09:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue | 5 +++++
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue | 6 ++++++
applications/drone-command/src/components/map-container/components/DevicePopup.vue | 4 ++--
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue | 5 +++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/components/map-container/components/DevicePopup.vue b/applications/drone-command/src/components/map-container/components/DevicePopup.vue
index e1f24f5..2f5c8a8 100644
--- a/applications/drone-command/src/components/map-container/components/DevicePopup.vue
+++ b/applications/drone-command/src/components/map-container/components/DevicePopup.vue
@@ -151,9 +151,9 @@
return `${val}台`
})
const popupRangeText = computed(() => {
- const val = props.device?.effectiveRangeKm
+ const val = Number(props.device?.effectiveRangeKm).toFixed(0) || 0
if (val == null) return '-'
- return `${val}KM`
+ return `${val}m`
})
</script>
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
index 44f488c..6a4411e 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
@@ -245,6 +245,11 @@
// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const parentCode = node.data?.id || '360800000000'
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
index df75267..8a14cad 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -213,6 +213,12 @@
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
+
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const res = await regionLazyTreeApi(params)
diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
index d54e7a0..2781012 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -276,6 +276,11 @@
// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const parentCode = node.data?.id || '360800000000'
--
Gitblit v1.9.3