From 42e7814f816bedba1a0ef8e8f8fb3df1f495c9db Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:27:58 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into feature/v9.0/9.0.1
---
src/views/layerManagement/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/layerManagement/index.vue b/src/views/layerManagement/index.vue
index 506055e..4e1a8b4 100644
--- a/src/views/layerManagement/index.vue
+++ b/src/views/layerManagement/index.vue
@@ -15,7 +15,7 @@
<span class="icon">
<el-icon><WarningFilled /></el-icon>
</span>
- <span>测区不支持交叉面</span>
+ <span>{{ showWarnToolTipText }}</span>
</div>
<div class="tool-tip" v-if="!isShowWaringTip && layerParams.addNest">
{{ showToolTipText }}
@@ -72,6 +72,7 @@
const userInfo = computed(() => store.getters.userInfo);
const areaCode = userInfo.value?.detail?.areaCode || '';
const showToolTipText = ref('点击地图生成测绘区域')
+const showWarnToolTipText = ref('测区不支持交叉面')
// 红色警告交叉面提示窗
const isShowWaringTip = ref(false);
const activeName = ref('自定义识别区');
@@ -417,7 +418,7 @@
}
if(polygon.length > 0 && !isShowWaringTip.value){
showToolTipText.value = '测绘区域已绘制完成'
- }else {
+ } else {
showToolTipText.value = '点击地图生成测绘区域'
}
@@ -436,13 +437,20 @@
const closedPolygon = isClosed ? polygon : [...polygon, firstPoint];
const turfPolygon = turf.polygon([closedPolygon]);
const area = _.round(turf.area(turfPolygon), 2);
- layerParams.value.fenceArea = area;
+ if (area / 1000000 < 50) {
+ layerParams.value.fenceArea = area;
+ } else {
+ layerParams.value.fenceArea = area;
+ isShowWaringTip.value = true
+ showWarnToolTipText.value = '自定义禁飞区不能超过50平方公里'
+ }
} else {
layerParams.value.fenceArea = 0;
}
};
drawPolygonExample.subscribe('getShowWaringTip', data => {
isShowWaringTip.value = data;
+ showWarnToolTipText.value = '测区不支持交叉面'
layerParams.value.crossSurface = data
});
const throttleLoadPlanarRoute = throttle(loadPlanarRoute, 200);
@@ -538,6 +546,7 @@
});
// 更新选中数据列表
selectDataList.value = selectDataList.value.filter(item => item.folder_id !== folderId);
+ getdataFolderApi()
};
</script>
--
Gitblit v1.9.3