From 63cda7b29ebe3be1560d8df4941e4c2b1763b3e1 Mon Sep 17 00:00:00 2001
From: huangchenhao <123673748@qq.com>
Date: Tue, 2 Dec 2025 16:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8C=83=E5=9B=B4=E5=9C=88?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=9A=84=E5=A1=AB=E5=85=85=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=2030km=E5=92=8C50km=E5=88=86=E5=88=AB=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/LeftPanel/ForcePreset.vue      |  6 ++--
 .../composables/useRangeCircle.js             | 29 +++++++++++++++----
 .../constants/coordinates.js                  |  5 ++--
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue
index 88cbb80..c069976 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue
@@ -5,7 +5,7 @@
       <!-- 触发器 -->
       <div class="dropdown-trigger" @click="toggleDropdown">
         <span class="trigger-text"
-          >距离灾害点{{ forcePreset.searchRadius - 20 }}km范围内</span
+          >距离灾害点{{ forcePreset.searchRadius }}km范围内</span
         >
         <div class="trigger-icon" :class="{ 'is-open': isDropdownOpen }">
           <img
@@ -156,8 +156,8 @@ const isDropdownOpen = ref(false);
 // 距离选项
 const distanceOptions = [
   // { value: 10, label: "距离灾害点10km范围内" },
-  { value: 30, label: "距离灾害点10km范围内" },
-  { value: 50, label: "距离灾害点30km范围内" },
+  { value: 30, label: "距离灾害点30km范围内" },
+  { value: 50, label: "距离灾害点50km范围内" },
 ];
 
 /**
diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js
index 85245ee..7685d3c 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js
@@ -59,28 +59,47 @@ export function useRangeCircle() {
     Cesium.Cartesian3.multiplyByScalar(offsetDirection, - radiusMeters * 0.2, offsetDirection) // 向下偏移 20%
     Cesium.Cartesian3.add(labelPositionCartesian, offsetDirection, labelPositionCartesian)
 
+    let fillColor
+    let fillAlpha
+    let outlineColor
+    if (radiusKm === 30) {
+      fillColor = '#3E9EF0' // 蓝色，30km范围圈
+      fillAlpha = 0.4
+      outlineColor = '#49CDD2'
+    } else if (radiusKm === 50) {
+      fillColor = '#10FF67' // 绿色，50km范围圈
+      fillAlpha = 0.2
+      outlineColor = '#51BCAF'
+    } else {
+      fillColor = style.fillColor // 默认颜色
+      fillAlpha = style.fillAlpha
+      outlineColor = style.outlineColor
+    }
+
     // 创建范围圈实体并添加到数组
     const circleEntity = viewer.entities.add({
       position: centerCartesian,
       ellipse: {
         semiMinorAxis: radiusMeters,
         semiMajorAxis: radiusMeters,
-        material: Cesium.Color.fromCssColorString(style.fillColor).withAlpha(style.fillAlpha),
+        material: Cesium.Color.fromCssColorString(fillColor).withAlpha(fillAlpha),
         outline: true,
-        outlineColor: Cesium.Color.fromCssColorString(style.outlineColor).withAlpha(style.outlineAlpha),
-        outlineWidth: style.outlineWidth,
+        outlineColor: Cesium.Color.fromCssColorString(outlineColor),
+        outlineWidth: 1,
+        // height: 1, 
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
       },
       allowPicking: false
     })
     rangeCircleEntities.value.push(circleEntity)
 
+
     // 创建半径线实体并添加到数组
     const lineEntity = viewer.entities.add({
       polyline: {
         positions: [centerCartesian, radiusEndCartesian],
         width: 2,
-        material: Cesium.Color.fromCssColorString(style.outlineColor).withAlpha(0.8),
+        material: Cesium.Color.fromCssColorString(outlineColor),
       },
       allowPicking: false
     })
@@ -90,7 +109,7 @@ export function useRangeCircle() {
     const currentLabelEntity = viewer.entities.add({
       position: labelPositionCartesian,
       label: {
-        text: `${radiusKm - 20} km`,
+        text: `${radiusKm} km`,
         font: 'bold 16px sans-serif',
         fillColor: Cesium.Color.WHITE,
         outlineColor: Cesium.Color.BLACK,
diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/constants/coordinates.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/constants/coordinates.js
index 942e06a..4d0918a 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/constants/coordinates.js
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/constants/coordinates.js
@@ -53,12 +53,11 @@ export const DEFAULT_CAMERA_VIEW = {
 export const DEFAULT_SEARCH_RADIUS = 10
 
 /**
- * 范围圈样式配置
+ * 范围圈样式默认配置
  */
 export const RANGE_CIRCLE_STYLE = {
   fillColor: '#1CA1FF',
   fillAlpha: 0.2,
   outlineColor: '#1CA1FF',
-  outlineAlpha: 0.8,
-  outlineWidth: 2,
+  outlineAlpha: 1,
 }