From fb39a7bb69cc55d2e1ce61d47e0677aa40540f95 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 30 Jan 2026 16:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/partition/shapeTools/draw/DrawBufferCircleTool.js b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
similarity index 95%
rename from applications/drone-command/src/views/areaManage/partition/shapeTools/draw/DrawBufferCircleTool.js
rename to applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
index ca5d4a9..937ce48 100644
--- a/applications/drone-command/src/views/areaManage/partition/shapeTools/draw/DrawBufferCircleTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
@@ -18,6 +18,9 @@
this.circleLevel1OutlineEntity = null
this.circleLevel2OutlineEntity = null
this.circleLevel3OutlineEntity = null
+ this.radiusPoint1 = null
+ this.radiusPoint2 = null
+ this.radiusPoint3 = null
this.isDrawing = false
this.drawStep = 0
this.isCompleted = false
@@ -56,6 +59,7 @@
this.radiusLevel1 = radius
this.radiusLevel2 = radius
this.radiusLevel3 = radius
+ this.radiusPoint1 = position
this.drawStep = 2
this.tooltip.show('单击设置二级缓冲圆', click.position)
return
@@ -65,6 +69,7 @@
const radius = Math.max(1, this.getSurfaceDistance(this.centerCartesian, position))
this.radiusLevel2 = Math.max(radius, this.radiusLevel1)
this.radiusLevel3 = this.radiusLevel2
+ this.radiusPoint2 = position
this.drawStep = 3
this.tooltip.show('单击设置三级缓冲圆', click.position)
return
@@ -73,6 +78,7 @@
if (this.drawStep === 3) {
const radius = Math.max(1, this.getSurfaceDistance(this.centerCartesian, position))
this.radiusLevel3 = Math.max(radius, this.radiusLevel2)
+ this.radiusPoint3 = position
this.isDrawing = false
this.drawStep = 0
this.isCompleted = true
@@ -82,6 +88,9 @@
meta: {
center: this.centerCartesian,
bufferRadii: [this.radiusLevel1, this.radiusLevel2, this.radiusLevel3],
+ controlPoints: [this.centerCartesian, this.radiusPoint1, this.radiusPoint2, this.radiusPoint3].filter(
+ Boolean
+ ),
},
})
this.tooltip.hide()
@@ -229,6 +238,9 @@
this.radiusLevel1 = 0
this.radiusLevel2 = 0
this.radiusLevel3 = 0
+ this.radiusPoint1 = null
+ this.radiusPoint2 = null
+ this.radiusPoint3 = null
this.isDrawing = false
this.drawStep = 0
this.isCompleted = false
--
Gitblit v1.9.3