diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java index 4af5fca..e0b97b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.core.controller.BaseController; @@ -21,6 +22,9 @@ public class RoomPlatformIconController extends BaseController { @Autowired private IRoomPlatformIconService roomPlatformIconService; + @Autowired + private RedisTemplate redisTemplate; + /** * 按房间ID查询该房间下所有地图平台图标（不分页） */ @@ -53,12 +57,19 @@ public class RoomPlatformIconController extends BaseController { } /** - * 删除 + * 删除（同步删除该实例在 Redis 中的平台样式，避免残留威力区/探测区） */ @PreAuthorize("@ss.hasPermi('system:roomPlatformIcon:remove')") @Log(title = "房间地图平台图标", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") public AjaxResult remove(@PathVariable Long id) { + RoomPlatformIcon icon = roomPlatformIconService.selectById(id); + if (icon != null && icon.getRoomId() != null) { + String key = "room:" + icon.getRoomId() + ":platformIcons:platforms"; + redisTemplate.opsForHash().delete(key, String.valueOf(id)); + String oldKey = "room:" + icon.getRoomId() + ":route:0:platforms"; + redisTemplate.opsForHash().delete(oldKey, String.valueOf(id)); + } return toAjax(roomPlatformIconService.deleteById(id)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java index 1048757..ee09762 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java @@ -58,34 +58,97 @@ public class RoutesController extends BaseController /** * 保存平台样式到 Redis + * 独立平台（routeId=0）：若传 platformIconInstanceId 则按实例存储，每个拖上去的图标一套样式；否则按 platformId 存储（兼容旧逻辑）。 */ @PreAuthorize("@ss.hasPermi('system:routes:edit')") @PostMapping("/savePlatformStyle") public AjaxResult savePlatformStyle(@RequestBody PlatformStyleDTO dto) { - if (dto.getRoomId() == null || dto.getRouteId() == null || dto.getPlatformId() == null) { + if (dto.getRoomId() == null || dto.getRouteId() == null) { return AjaxResult.error("参数不完整"); } - String key = "room:" + dto.getRoomId() + ":route:" + dto.getRouteId() + ":platforms"; - redisTemplate.opsForHash().put(key, String.valueOf(dto.getPlatformId()), JSON.toJSONString(dto)); + Long routeId = dto.getRouteId(); + boolean isPlatformIcon = routeId != null && routeId == 0L; + if (isPlatformIcon) { + if (dto.getPlatformIconInstanceId() == null && dto.getPlatformId() == null) { + return AjaxResult.error("独立平台样式需传 platformIconInstanceId 或 platformId"); + } + } else { + if (dto.getPlatformId() == null) { + return AjaxResult.error("参数不完整"); + } + } + + String key = isPlatformIcon + ? ("room:" + dto.getRoomId() + ":platformIcons:platforms") + : ("room:" + dto.getRoomId() + ":route:" + routeId + ":platforms"); + String hashField = isPlatformIcon && dto.getPlatformIconInstanceId() != null + ? String.valueOf(dto.getPlatformIconInstanceId()) + : String.valueOf(dto.getPlatformId()); + redisTemplate.opsForHash().put(key, hashField, JSON.toJSONString(dto)); + + if (isPlatformIcon && dto.getPlatformIconInstanceId() != null) { + String oldKey = "room:" + dto.getRoomId() + ":route:0:platforms"; + redisTemplate.opsForHash().delete(oldKey, hashField); + } else if (isPlatformIcon) { + String oldKey = "room:" + dto.getRoomId() + ":route:0:platforms"; + redisTemplate.opsForHash().delete(oldKey, String.valueOf(dto.getPlatformId())); + } return success(); } /** * 从 Redis 获取平台样式 + * 独立平台（routeId=0）：优先用 platformIconInstanceId 取该实例样式；未传时用 platformId（兼容旧数据）。 */ @PreAuthorize("@ss.hasPermi('system:routes:query')") @GetMapping("/getPlatformStyle") public AjaxResult getPlatformStyle(PlatformStyleDTO dto) { - if (dto.getRoomId() == null || dto.getRouteId() == null || dto.getPlatformId() == null) { + if (dto.getRoomId() == null || dto.getRouteId() == null) { return AjaxResult.error("参数不完整"); } - String key = "room:" + dto.getRoomId() + ":route:" + dto.getRouteId() + ":platforms"; - Object val = redisTemplate.opsForHash().get(key, String.valueOf(dto.getPlatformId())); - if (val != null) { - return success(JSON.parseObject(val.toString(), PlatformStyleDTO.class)); + Long routeId = dto.getRouteId(); + boolean isPlatformIcon = routeId != null && routeId == 0L; + if (isPlatformIcon) { + if (dto.getPlatformIconInstanceId() == null && dto.getPlatformId() == null) { + return AjaxResult.error("独立平台样式需传 platformIconInstanceId 或 platformId"); + } + } else { + if (dto.getPlatformId() == null) { + return AjaxResult.error("参数不完整"); + } } + + String key = isPlatformIcon + ? ("room:" + dto.getRoomId() + ":platformIcons:platforms") + : ("room:" + dto.getRoomId() + ":route:" + routeId + ":platforms"); + String hashField = isPlatformIcon && dto.getPlatformIconInstanceId() != null + ? String.valueOf(dto.getPlatformIconInstanceId()) + : String.valueOf(dto.getPlatformId()); + Object val = redisTemplate.opsForHash().get(key, hashField); + if (val == null && isPlatformIcon) { + String oldKey = "room:" + dto.getRoomId() + ":route:0:platforms"; + val = redisTemplate.opsForHash().get(oldKey, hashField); + } + if (val != null) return success(JSON.parseObject(val.toString(), PlatformStyleDTO.class)); + return success(); + } + + /** + * 删除独立平台图标样式（按实例删除，避免删除图标后仍残留威力区/探测区） + */ + @PreAuthorize("@ss.hasPermi('system:routes:edit')") + @DeleteMapping("/platformIconStyle") + public AjaxResult deletePlatformIconStyle(@RequestParam Long roomId, @RequestParam Long platformIconInstanceId) + { + if (roomId == null || platformIconInstanceId == null) { + return AjaxResult.error("roomId 与 platformIconInstanceId 不能为空"); + } + String key = "room:" + roomId + ":platformIcons:platforms"; + redisTemplate.opsForHash().delete(key, String.valueOf(platformIconInstanceId)); + String oldKey = "room:" + roomId + ":route:0:platforms"; + redisTemplate.opsForHash().delete(oldKey, String.valueOf(platformIconInstanceId)); return success(); } @@ -440,10 +503,16 @@ public class RoutesController extends BaseController int rows = routesService.deleteRoutesByIds(ids); if (rows > 0) { for (Long routeId : ids) { + // 清除该航线在所有房间下的导弹参数 Set keys = redisTemplate.keys("missile:params:*:" + routeId + ":*"); if (keys != null && !keys.isEmpty()) { redisTemplate.delete(keys); } + // 同步删除该航线在所有房间下的平台样式（探测区/威力区等），避免库表已删但 Redis 仍残留 + Set styleKeys = redisTemplate.keys("room:*:route:" + routeId + ":platforms"); + if (styleKeys != null && !styleKeys.isEmpty()) { + redisTemplate.delete(styleKeys); + } } } return toAjax(rows); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/PlatformStyleDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/PlatformStyleDTO.java index 7d9ef64..f9af395 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/PlatformStyleDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/PlatformStyleDTO.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.dto; import java.io.Serializable; +import java.util.List; /** * 平台样式 DTO @@ -11,7 +12,10 @@ public class PlatformStyleDTO implements Serializable { private String roomId; private Long routeId; private Long platformId; - + + /** 独立平台图标实例 ID（拖到地图上的每条记录的 id，非平台类型 id）。routeId=0 时用此字段作 Redis hash field，实现每个实例独立样式 */ + private Long platformIconInstanceId; + /** 平台名称 */ private String platformName; @@ -27,6 +31,12 @@ public class PlatformStyleDTO implements Serializable { /** 平台颜色 */ private String platformColor; + /** 多探测区配置（支持叠加与独立显隐） */ + private List detectionZones; + + /** 多威力区配置（支持叠加与独立显隐） */ + private List powerZones; + /** 探测区半径（千米），整圆 */ private Double detectionZoneRadius; /** 探测区填充颜色 */ @@ -47,6 +57,151 @@ public class PlatformStyleDTO implements Serializable { /** 威力区是否在地图上显示 */ private Boolean powerZoneVisible; + public static class DetectionZoneDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** zone 唯一 id（前端生成，后端原样保存） */ + private String zoneId; + + /** 探测区半径（千米） */ + private Double radiusKm; + + /** 探测区填充颜色（css rgba 或 hex） */ + private String color; + + /** 探测区透明度 0-1 */ + private Double opacity; + + /** 是否在地图上显示 */ + private Boolean visible; + + public String getZoneId() { + return zoneId; + } + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; + } + + public Double getRadiusKm() { + return radiusKm; + } + + public void setRadiusKm(Double radiusKm) { + this.radiusKm = radiusKm; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public Double getOpacity() { + return opacity; + } + + public void setOpacity(Double opacity) { + this.opacity = opacity; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + } + + public static class PowerZoneDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** zone 唯一 id（前端生成，后端原样保存） */ + private String zoneId; + + /** 威力区半径（千米） */ + private Double radiusKm; + + /** 威力区扇形夹角（度） */ + private Double angleDeg; + + /** 威力区填充颜色（css rgba 或 hex） */ + private String color; + + /** 威力区透明度 0-1 */ + private Double opacity; + + /** 是否在地图上显示 */ + private Boolean visible; + + public String getZoneId() { + return zoneId; + } + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; + } + + public Double getRadiusKm() { + return radiusKm; + } + + public void setRadiusKm(Double radiusKm) { + this.radiusKm = radiusKm; + } + + public Double getAngleDeg() { + return angleDeg; + } + + public void setAngleDeg(Double angleDeg) { + this.angleDeg = angleDeg; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public Double getOpacity() { + return opacity; + } + + public void setOpacity(Double opacity) { + this.opacity = opacity; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + } + + public List getDetectionZones() { + return detectionZones; + } + + public void setDetectionZones(List detectionZones) { + this.detectionZones = detectionZones; + } + + public List getPowerZones() { + return powerZones; + } + + public void setPowerZones(List powerZones) { + this.powerZones = powerZones; + } + public String getRoomId() { return roomId; } @@ -71,6 +226,14 @@ public class PlatformStyleDTO implements Serializable { this.platformId = platformId; } + public Long getPlatformIconInstanceId() { + return platformIconInstanceId; + } + + public void setPlatformIconInstanceId(Long platformIconInstanceId) { + this.platformIconInstanceId = platformIconInstanceId; + } + public String getPlatformName() { return platformName; } diff --git a/ruoyi-ui/src/api/system/routes.js b/ruoyi-ui/src/api/system/routes.js index f519267..124a5e1 100644 --- a/ruoyi-ui/src/api/system/routes.js +++ b/ruoyi-ui/src/api/system/routes.js @@ -65,6 +65,15 @@ export function getPlatformStyle(query) { }) } +// 删除独立平台图标样式（按实例删除，避免删除图标后残留威力区/探测区） +export function deletePlatformIconStyle(roomId, platformIconInstanceId) { + return request({ + url: '/system/routes/platformIconStyle', + method: 'delete', + params: { roomId, platformIconInstanceId } + }) +} + // 保存4T数据到Redis（禁用防重复提交，因拖拽/调整大小可能快速连续触发保存） export function save4TData(data) { return request({ diff --git a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue index e200595..4f13a65 100644 --- a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue +++ b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue @@ -504,6 +504,24 @@ + +
+
探测区
+
+ {{ detectionZoneVisible ? '👁' : '👁‍🗨' }} + {{ detectionZoneVisible ? '隐藏该探测区' : '显示该探测区' }} +
+
+ + +
+
威力区
+
+ {{ powerZoneVisible ? '👁' : '👁‍🗨' }} + {{ powerZoneVisible ? '隐藏该威力区' : '显示该威力区' }} +
+
+
白板平台
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index 35555ca..7c13b26 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -330,7 +330,7 @@ import RadiusDialog from '../dialogs/RadiusDialog.vue' import axios from 'axios' import request from '@/utils/request' import { getToken } from '@/utils/auth' -import { savePlatformStyle, getRoutes, getPlatformStyle, getMissileParams, saveMissileParams, deleteMissileParams } from '@/api/system/routes' +import { savePlatformStyle, getRoutes, getPlatformStyle, getMissileParams, saveMissileParams, deleteMissileParams, deletePlatformIconStyle } from '@/api/system/routes' export default { name: 'CesiumMap', @@ -477,6 +477,7 @@ export default { detectionZoneForm: { routeId: null, platformIconId: null, + platformIconInstanceId: null, roomId: null, platformId: null, radius: 50, @@ -488,6 +489,7 @@ export default { powerZoneForm: { routeId: null, platformIconId: null, + platformIconInstanceId: null, roomId: null, platformId: null, radius: 300, @@ -586,6 +588,13 @@ export default { PLATFORM_DRAG_THRESHOLD_PX: 10, DESIRED_BOX_HALF_PX: 58, DESIRED_ROTATE_OFFSET_PX: 50, + // 平台图标编辑：伸缩框（矩形边线 + 四角缩放点 + 旋转手柄）的视觉风格 + TRANSFORM_HANDLE_PRIMARY_COLOR: '#94A3B8', + TRANSFORM_HANDLE_PRIMARY_LIGHT_COLOR: '#E2E8F0', + TRANSFORM_HANDLE_FRAME_WIDTH: 2, + TRANSFORM_HANDLE_POINT_SIZE: 11, + TRANSFORM_HANDLE_POINT_OUTLINE_WIDTH: 2, + TRANSFORM_HANDLE_GLOW_ALPHA: 0.10, // 实体点击防抖，避免双击误触导致相机高度剧烈变化 entityClickDebounceTimer: null, lastEntityClickTime: 0, @@ -722,12 +731,19 @@ export default { contextMenuZoneDetectionVisible() { const ed = this.contextMenu && this.contextMenu.entityData if (!ed) return true + if (ed.type === 'detectionZone') { + return ed.zoneVisible === false ? false : true + } if (ed.type === 'routePlatform' && ed.routeId != null) { const c = this.platformCustomStyles && this.platformCustomStyles[ed.routeId] - return c && c.detectionZoneVisible === false ? false : true + if (!c) return true + if (Array.isArray(c.detectionZones)) return c.detectionZones.some(z => z && z.visible !== false) + return c.detectionZoneVisible === false ? false : true } if (ed.type === 'platformIcon' && ed.id) { const c = this.platformIconZoneStyles && this.platformIconZoneStyles[ed.id] + if (!c) return true + if (Array.isArray(c.detectionZones)) return c.detectionZones.some(z => z && z.visible !== false) return c && c.detectionZoneVisible === false ? false : true } return true @@ -735,12 +751,19 @@ export default { contextMenuZonePowerVisible() { const ed = this.contextMenu && this.contextMenu.entityData if (!ed) return true + if (ed.type === 'powerZone') { + return ed.zoneVisible === false ? false : true + } if (ed.type === 'routePlatform' && ed.routeId != null) { const c = this.platformCustomStyles && this.platformCustomStyles[ed.routeId] + if (!c) return true + if (Array.isArray(c.powerZones)) return c.powerZones.some(z => z && z.visible !== false) return c && c.powerZoneVisible === false ? false : true } if (ed.type === 'platformIcon' && ed.id) { const c = this.platformIconZoneStyles && this.platformIconZoneStyles[ed.id] + if (!c) return true + if (Array.isArray(c.powerZones)) return c.powerZones.some(z => z && z.visible !== false) return c && c.powerZoneVisible === false ? false : true } return true @@ -1711,8 +1734,11 @@ export default { /** 伸缩框旋转手柄图标 SVG：蓝底、白边、白色弧形箭头 */ getRotationHandleIconDataUrl() { + const primary = this.TRANSFORM_HANDLE_PRIMARY_COLOR || '#2563EB'; + const light = this.TRANSFORM_HANDLE_PRIMARY_LIGHT_COLOR || '#93C5FD'; const svg = '' + - '' + + `` + + `` + '' + '' + @@ -1813,21 +1839,32 @@ export default { id: id + '-scale-' + i, position: pos, point: { - pixelSize: 14, - color: Cesium.Color.WHITE, - outlineColor: Cesium.Color.fromCssColorString('#008aff'), - outlineWidth: 3, + pixelSize: this.TRANSFORM_HANDLE_POINT_SIZE, + color: Cesium.Color.WHITE.withAlpha(0.98), + outlineColor: Cesium.Color.fromCssColorString(this.TRANSFORM_HANDLE_PRIMARY_COLOR), + outlineWidth: this.TRANSFORM_HANDLE_POINT_OUTLINE_WIDTH, disableDepthTestDistance: Number.POSITIVE_INFINITY } }) ); const linePositions = [corners[0], corners[1], corners[2], corners[3], corners[0]]; + // 发光柔边（在主边框后面绘制，视觉更柔和） + const frameGlow = this.viewer.entities.add({ + id: id + '-scale-frame-glow', + polyline: { + positions: linePositions, + width: this.TRANSFORM_HANDLE_FRAME_WIDTH + 3, + material: Cesium.Color.fromCssColorString(this.TRANSFORM_HANDLE_PRIMARY_COLOR).withAlpha(this.TRANSFORM_HANDLE_GLOW_ALPHA), + arcType: Cesium.ArcType.NONE, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }); const frameLine = this.viewer.entities.add({ id: id + '-scale-frame', polyline: { positions: linePositions, - width: 3, - material: Cesium.Color.fromCssColorString('#008aff'), + width: this.TRANSFORM_HANDLE_FRAME_WIDTH, + material: Cesium.Color.fromCssColorString(this.TRANSFORM_HANDLE_PRIMARY_COLOR).withAlpha(0.98), arcType: Cesium.ArcType.NONE, disableDepthTestDistance: Number.POSITIVE_INFINITY } @@ -1835,7 +1872,8 @@ export default { entityData.transformHandles = { rotation: rotationHandle, scale: scaleHandles, - frame: frameLine + frame: frameLine, + frameGlow }; }, @@ -1845,6 +1883,7 @@ export default { const h = entityData.transformHandles; if (h.rotation) this.viewer.entities.remove(h.rotation); if (h.scale) h.scale.forEach(e => this.viewer.entities.remove(e)); + if (h.frameGlow) this.viewer.entities.remove(h.frameGlow); if (h.frame) this.viewer.entities.remove(h.frame); entityData.transformHandles = null; }, @@ -1868,7 +1907,12 @@ export default { ]; entityData.transformHandles.scale.forEach((ent, i) => { ent.position = corners[i]; }); const linePositions = [corners[0], corners[1], corners[2], corners[3], corners[0]]; - entityData.transformHandles.frame.polyline.positions = new Cesium.ConstantProperty(linePositions); + if (entityData.transformHandles.frame) { + entityData.transformHandles.frame.polyline.positions = new Cesium.ConstantProperty(linePositions); + } + if (entityData.transformHandles.frameGlow) { + entityData.transformHandles.frameGlow.polyline.positions = new Cesium.ConstantProperty(linePositions); + } this.viewer.scene.requestRender(); }, @@ -1933,7 +1977,7 @@ export default { if (this.selectedPlatformIcon) this.removeTransformHandles(this.selectedPlatformIcon); this.selectedPlatformIcon = entityData; this.showTransformHandles(entityData); - this.$message && this.$message.success('已放置。上方箭头旋转、四角调大小、拖动图标移动；点击空白收起'); + // 放置平台图标后的交互提示会遮挡地图，当前禁用以免影响操作 }); return entityData; }, @@ -1945,8 +1989,16 @@ export default { this.removeTransformHandles(ed); if (this.selectedPlatformIcon === ed) this.selectedPlatformIcon = null; if (ed.id && this.viewer) { - this.viewer.entities.removeById(`detection-zone-platformIcon-${ed.id}`); - this.viewer.entities.removeById(`power-zone-platformIcon-${ed.id}`); + const detectionPrefix = `detection-zone-platformIcon-${ed.id}-` + const powerPrefix = `power-zone-platformIcon-${ed.id}-` + const entities = this.viewer.entities.values + for (let i = entities.length - 1; i >= 0; i--) { + const e = entities[i] + const eid = typeof e.id === 'string' ? e.id : '' + if (eid.startsWith(detectionPrefix) || eid.startsWith(powerPrefix)) { + this.viewer.entities.remove(e) + } + } } if (ed.entity) this.viewer && this.viewer.entities.remove(ed.entity); }); @@ -2009,32 +2061,53 @@ export default { }; this.allEntities.push(entityData); }); - // 从 Redis 加载独立平台的探测区/威力区（routeId=0） + // 从 Redis 加载独立平台的探测区/威力区（routeId=0，按实例 ID 取样式，每个拖上去的图标独立一套） list.forEach((item) => { const platformIconId = `platformIcon_room_${roomId}_${item.id}`; const platformId = item.platformId; - if (!platformId) return; - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { + const instanceId = item.id; + if (instanceId == null) return; + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: instanceId }; + getPlatformStyle(query).then(res => { const style = res.data; if (!style) return; - if (style.detectionZoneVisible !== false && style.detectionZoneRadius != null && Number(style.detectionZoneRadius) > 0) { - this.ensureDetectionZoneForPlatformIcon(platformIconId, style.detectionZoneRadius, style.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', style.detectionZoneOpacity); - } - if (style.powerZoneVisible !== false && style.powerZoneRadius != null && Number(style.powerZoneRadius) > 0) { - this.ensurePowerZoneForPlatformIcon(platformIconId, style.powerZoneRadius, style.powerZoneAngle ?? 120, style.powerZoneColor || 'rgba(255, 0, 0, 0.3)', style.powerZoneOpacity); - } - if (style.detectionZoneRadius != null || style.powerZoneRadius != null) { + const normalized = this.normalizeZonesFromStyle(style) + const detectionZones = normalized.detectionZones || [] + const powerZones = normalized.powerZones || [] + + // 绘制 visible 的 zones + detectionZones.forEach(dz => { + if (!dz) return + if (dz.radiusKm == null || Number(dz.radiusKm) <= 0) return + const opacity = dz.visible === false ? 0 : dz.opacity + this.ensureDetectionZoneForPlatformIcon(platformIconId, dz.zoneId, dz.radiusKm, dz.color, opacity) + }) + powerZones.forEach(pz => { + if (!pz) return + if (pz.radiusKm == null || Number(pz.radiusKm) <= 0) return + const opacity = pz.visible === false ? 0 : pz.opacity + this.ensurePowerZoneForPlatformIcon(platformIconId, pz.zoneId, pz.radiusKm, pz.angleDeg ?? 120, pz.color, opacity) + }) + + // 缓存：支持多个 zones + 独立显隐 + const firstDetection = detectionZones[0] || null + const firstPower = powerZones[0] || null + if (detectionZones.length > 0 || powerZones.length > 0) { this.$set(this.platformIconZoneStyles, platformIconId, { - detectionZoneRadius: style.detectionZoneRadius, - detectionZoneColor: style.detectionZoneColor, - detectionZoneOpacity: style.detectionZoneOpacity, - detectionZoneVisible: style.detectionZoneVisible !== false, - powerZoneRadius: style.powerZoneRadius, - powerZoneAngle: style.powerZoneAngle, - powerZoneColor: style.powerZoneColor, - powerZoneOpacity: style.powerZoneOpacity, - powerZoneVisible: style.powerZoneVisible !== false - }); + ...(this.platformIconZoneStyles[platformIconId] || {}), + detectionZones, + powerZones, + // 兼容旧逻辑：取第一个 zone 作为“单区字段” + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : null, + detectionZoneColor: firstDetection ? firstDetection.color : null, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : null, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : false, + powerZoneRadius: firstPower ? firstPower.radiusKm : null, + powerZoneAngle: firstPower ? firstPower.angleDeg : null, + powerZoneColor: firstPower ? firstPower.color : null, + powerZoneOpacity: firstPower ? firstPower.opacity : null, + powerZoneVisible: firstPower ? firstPower.visible !== false : false + }) } }).catch(() => {}); }); @@ -2252,15 +2325,25 @@ export default { if (cachedStyle && cachedStyle.platformColor != null) { const size = (cachedStyle.platformSize != null) ? Math.max(48, Math.min(256, Number(cachedStyle.platformSize))) : 144; addPlatformBillboard(cachedStyle.platformColor, size); - if (cachedStyle.detectionZoneVisible !== false && cachedStyle.detectionZoneRadius != null && Number(cachedStyle.detectionZoneRadius) > 0) { + if (Array.isArray(cachedStyle.detectionZones) && cachedStyle.detectionZones.length > 0) { this.$nextTick(() => { - this.ensureDetectionZoneForRoute(routeId, cachedStyle.detectionZoneRadius, cachedStyle.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', cachedStyle.detectionZoneOpacity); - }); + cachedStyle.detectionZones.forEach(dz => { + if (!dz) return + if (dz.radiusKm == null || Number(dz.radiusKm) <= 0) return + const opacity = dz.visible === false ? 0 : dz.opacity + this.ensureDetectionZoneForRoute(routeId, dz.zoneId, dz.radiusKm, dz.color, opacity) + }) + }) } - if (cachedStyle.powerZoneVisible !== false && cachedStyle.powerZoneRadius != null && Number(cachedStyle.powerZoneRadius) > 0) { + if (Array.isArray(cachedStyle.powerZones) && cachedStyle.powerZones.length > 0) { this.$nextTick(() => { - this.ensurePowerZoneForRoute(routeId, cachedStyle.powerZoneRadius, cachedStyle.powerZoneAngle ?? 120, cachedStyle.powerZoneColor || 'rgba(255, 0, 0, 0.3)', cachedStyle.powerZoneOpacity); - }); + cachedStyle.powerZones.forEach(pz => { + if (!pz) return + if (pz.radiusKm == null || Number(pz.radiusKm) <= 0) return + const opacity = pz.visible === false ? 0 : pz.opacity + this.ensurePowerZoneForRoute(routeId, pz.zoneId, pz.radiusKm, pz.angleDeg ?? 120, pz.color, opacity) + }) + }) } } else if (currentRoomId && Number(platId) > 0) { getPlatformStyle({ @@ -2271,33 +2354,45 @@ export default { let style = res.data; const defaultColor = '#000000'; const defaultSize = 144; - const hasZoneOnRoute = style && (style.detectionZoneRadius != null || style.powerZoneRadius != null); + const hasZoneOnRoute = style && ( + style.detectionZoneRadius != null || + style.powerZoneRadius != null || + (Array.isArray(style.detectionZones) && style.detectionZones.length > 0) || + (Array.isArray(style.powerZones) && style.powerZones.length > 0) + ); const applyStyle = (s) => { const color = (s && s.platformColor) ? s.platformColor : defaultColor; const size = (s && s.platformSize != null) ? Math.max(48, Math.min(256, Number(s.platformSize))) : defaultSize; - this.$set(this.platformCustomStyles, routeId, { - labelFontSize: s && s.labelFontSize, - labelFontColor: s && s.labelFontColor, - platformSize: size, - platformColor: color, - detectionZoneRadius: s && s.detectionZoneRadius, - detectionZoneColor: s && s.detectionZoneColor, - detectionZoneOpacity: s && s.detectionZoneOpacity, - detectionZoneVisible: s && s.detectionZoneVisible !== false, - powerZoneRadius: s && s.powerZoneRadius, - powerZoneAngle: s && s.powerZoneAngle, - powerZoneColor: s && s.powerZoneColor, - powerZoneOpacity: s && s.powerZoneOpacity, - powerZoneVisible: s && s.powerZoneVisible !== false - }); + const styleObj = { ...(s || {}), platformColor: color, platformSize: size } + this.setPlatformStyle(routeId, styleObj) addPlatformBillboard(color, size); - if (s && s.detectionZoneVisible !== false && s.detectionZoneRadius != null && Number(s.detectionZoneRadius) > 0) { - this.$nextTick(() => this.ensureDetectionZoneForRoute(routeId, s.detectionZoneRadius, s.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', s.detectionZoneOpacity)); + const cachedStyleNow = this.platformCustomStyles && this.platformCustomStyles[routeId] + const dzs = (cachedStyleNow && cachedStyleNow.detectionZones) ? cachedStyleNow.detectionZones : this.normalizeDetectionZonesFromStyle(styleObj) + const pzs = (cachedStyleNow && cachedStyleNow.powerZones) ? cachedStyleNow.powerZones : this.normalizePowerZonesFromStyle(styleObj) + if (Array.isArray(dzs) && dzs.length > 0) { + this.$nextTick(() => { + dzs.forEach(dz => { + if (!dz) return + if (dz.radiusKm == null || Number(dz.radiusKm) <= 0) return + const opacity = dz.visible === false ? 0 : dz.opacity + this.ensureDetectionZoneForRoute(routeId, dz.zoneId, dz.radiusKm, dz.color, opacity) + }) + }) } - if (s && s.powerZoneVisible !== false && s.powerZoneRadius != null && Number(s.powerZoneRadius) > 0) { - this.$nextTick(() => this.ensurePowerZoneForRoute(routeId, s.powerZoneRadius, s.powerZoneAngle ?? 120, s.powerZoneColor || 'rgba(255, 0, 0, 0.3)', s.powerZoneOpacity)); + if (Array.isArray(pzs) && pzs.length > 0) { + this.$nextTick(() => { + pzs.forEach(pz => { + if (!pz) return + if (pz.radiusKm == null || Number(pz.radiusKm) <= 0) return + const opacity = pz.visible === false ? 0 : pz.opacity + this.ensurePowerZoneForRoute(routeId, pz.zoneId, pz.radiusKm, pz.angleDeg ?? 120, pz.color, opacity) + }) + }) } if (!s || s.platformColor == null) { + const normalized = this.normalizeZonesFromStyle(s) + const firstDetection = normalized.detectionZones[0] || null + const firstPower = normalized.powerZones[0] || null savePlatformStyle({ roomId: String(currentRoomId), routeId: routeId, @@ -2306,44 +2401,66 @@ export default { labelFontSize: (s && s.labelFontSize != null) ? s.labelFontSize : 16, labelFontColor: (s && s.labelFontColor) || '#333333', platformSize: size, - platformColor: defaultColor + platformColor: defaultColor, + detectionZones: normalized.detectionZones, + powerZones: normalized.powerZones, + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : s && s.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : s && s.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : s && s.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : s && s.detectionZoneVisible, + powerZoneRadius: firstPower ? firstPower.radiusKm : s && s.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : s && s.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : s && s.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : s && s.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : s && s.powerZoneVisible }).catch(() => {}); } }; if (currentRoomId && platId && !hasZoneOnRoute) { getPlatformStyle({ roomId: currentRoomId, routeId: 0, platformId: platId }).then(standRes => { const stand = standRes.data; - if (stand && (stand.detectionZoneRadius != null || stand.powerZoneRadius != null)) { - style = Object.assign({}, style || {}, { - detectionZoneRadius: stand.detectionZoneRadius, - detectionZoneColor: stand.detectionZoneColor, - detectionZoneOpacity: stand.detectionZoneOpacity, - detectionZoneVisible: stand.detectionZoneVisible !== false, - powerZoneRadius: stand.powerZoneRadius, - powerZoneAngle: stand.powerZoneAngle, - powerZoneColor: stand.powerZoneColor, - powerZoneOpacity: stand.powerZoneOpacity, - powerZoneVisible: stand.powerZoneVisible !== false - }); - savePlatformStyle({ - roomId: String(currentRoomId), - routeId: routeId, - platformId: platId, - platformName: (style.platformName || (platform && platform.name)) || undefined, - labelFontSize: style.labelFontSize, - labelFontColor: style.labelFontColor, - platformSize: style.platformSize, - platformColor: style.platformColor, - detectionZoneRadius: style.detectionZoneRadius, - detectionZoneColor: style.detectionZoneColor, - detectionZoneOpacity: style.detectionZoneOpacity, - detectionZoneVisible: style.detectionZoneVisible, - powerZoneRadius: style.powerZoneRadius, - powerZoneAngle: style.powerZoneAngle, - powerZoneColor: style.powerZoneColor, - powerZoneOpacity: style.powerZoneOpacity, - powerZoneVisible: style.powerZoneVisible - }).catch(() => {}); + if (stand) { + const normalizedStand = this.normalizeZonesFromStyle(stand) + const savedDetectionZones = normalizedStand.detectionZones || [] + const savedPowerZones = normalizedStand.powerZones || [] + if (savedDetectionZones.length > 0 || savedPowerZones.length > 0) { + const firstSavedDetection = savedDetectionZones[0] || null + const firstSavedPower = savedPowerZones[0] || null + style = Object.assign({}, style || {}, { + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : stand.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : stand.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : stand.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : stand.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : stand.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : stand.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : stand.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : stand.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : stand.powerZoneVisible + }); + savePlatformStyle({ + roomId: String(currentRoomId), + routeId: routeId, + platformId: platId, + platformName: (style.platformName || (platform && platform.name)) || undefined, + labelFontSize: style.labelFontSize, + labelFontColor: style.labelFontColor, + platformSize: style.platformSize, + platformColor: style.platformColor, + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + detectionZoneRadius: style.detectionZoneRadius, + detectionZoneColor: style.detectionZoneColor, + detectionZoneOpacity: style.detectionZoneOpacity, + detectionZoneVisible: style.detectionZoneVisible, + powerZoneRadius: style.powerZoneRadius, + powerZoneAngle: style.powerZoneAngle, + powerZoneColor: style.powerZoneColor, + powerZoneOpacity: style.powerZoneOpacity, + powerZoneVisible: style.powerZoneVisible + }).catch(() => {}); + } } applyStyle(style); }).catch(() => applyStyle(style)); @@ -4229,10 +4346,22 @@ export default { }, removePowerZoneByRouteId(routeId) { - this.viewer.entities.removeById(`power-zone-${routeId}`); + const prefix = `power-zone-${routeId}-` + const entities = this.viewer.entities.values + for (let i = entities.length - 1; i >= 0; i--) { + const e = entities[i] + const eid = typeof e.id === 'string' ? e.id : '' + if (eid.startsWith(prefix)) this.viewer.entities.remove(e) + } }, removeDetectionZoneByRouteId(routeId) { - this.viewer.entities.removeById(`detection-zone-${routeId}`); + const prefix = `detection-zone-${routeId}-` + const entities = this.viewer.entities.values + for (let i = entities.length - 1; i >= 0; i--) { + const e = entities[i] + const eid = typeof e.id === 'string' ? e.id : '' + if (eid.startsWith(prefix)) this.viewer.entities.remove(e) + } }, removeRouteById(routeId) { @@ -4243,8 +4372,10 @@ export default { let shouldRemove = false; // 平台图标与标牌实体、航线弧线/盘旋：通过 id 匹配 const idStr = typeof entity.id === 'string' ? entity.id : ''; - if (entity.id === `route-platform-${routeId}` || entity.id === `route-platform-label-${routeId}` || entity.id === `detection-zone-${routeId}` || entity.id === `power-zone-${routeId}`) { + if (entity.id === `route-platform-${routeId}` || entity.id === `route-platform-label-${routeId}`) { shouldRemove = true; + } else if (idStr.startsWith(`detection-zone-${routeId}-`) || idStr.startsWith(`power-zone-${routeId}-`)) { + shouldRemove = true } else if (idStr.startsWith(`hold-line-${routeId}-`) || idStr.startsWith(`arc-line-${routeId}-`)) { shouldRemove = true; } else if (entity.properties && entity.properties.routeId) { @@ -5176,18 +5307,216 @@ export default { // 隐藏之前可能显示的菜单 this.contextMenu.visible = false; - // 使用 drillPick 获取重叠/接近位置的所有实体（11x11 像素拾取区域，便于选中重叠或接近的图形） + const pickedObject = this.viewer.scene.pick(click.position) const drillPicks = this.viewer.scene.drillPick(click.position, 20, 11, 11); const pickList = []; + const seenEntities = new Set(); - for (const pick of drillPicks) { - const pickedEntity = pick.id || pick.object; - if (!pickedEntity || seenEntities.has(pickedEntity)) continue; - const entityData = this.resolveEntityDataFromPick(pickedEntity); + if (Cesium.defined(pickedObject) && pickedObject.id) { + const pickedEntity = pickedObject.id + const idStr = typeof pickedEntity.id === 'string' ? pickedEntity.id : (pickedEntity.id || '') + let entityData = null + // 航线上的飞机（平台图标）：右键可切换标牌显示/隐藏 + if (idStr.startsWith('route-platform-')) { + const routeId = idStr.replace('route-platform-', '').replace('route-platform-label-', '') + // 尝试获取该实体绑定的 platformId 和 platformName + // 通常这些信息绑定在 entity.properties 中 + let platformId = 0 + let platformName = '平台' + if (pickedEntity.properties) { + const now = Cesium.JulianDate.now(); + // 尝试直接获取 + if (pickedEntity.properties.platformId) { + platformId = pickedEntity.properties.platformId.getValue ? pickedEntity.properties.platformId.getValue(now) : pickedEntity.properties.platformId + } + if (pickedEntity.properties.platformName) { + platformName = pickedEntity.properties.platformName.getValue ? pickedEntity.properties.platformName.getValue(now) : pickedEntity.properties.platformName + } + } + + entityData = { + type: 'routePlatform', + routeId, + entity: pickedEntity, + platformId, + platformName, + labelVisible: this.routeLabelVisible[routeId] !== false + } + + // 尝试获取位置信息，以便后续使用 + const now = Cesium.JulianDate.now(); + if (pickedEntity.position) { + const pos = pickedEntity.position.getValue(now); + if (pos) { + const ll = this.cartesianToLatLng(pos); + if (ll) { + entityData.lat = ll.lat; + entityData.lng = ll.lng; + } + } + } + } + if (!entityData && idStr.startsWith('wb_')) { + entityData = this.whiteboardEntityDataMap && this.whiteboardEntityDataMap[idStr] + } + // 探测区/威力区（单个 zone）：右键直接作用于该 zone + if (!entityData) { + const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + // detection-zone-platformIcon-${platformIconId}-${zoneId} + if (idStr.startsWith('detection-zone-platformIcon-')) { + const parts = idStr.split('-') + if (parts.length >= 5) { + const platformIconId = parts[3] + const zoneId = parts.slice(4).join('-') + const cache = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] + const zone = cache && Array.isArray(cache.detectionZones) ? cache.detectionZones.find(z => z && z.zoneId === zoneId) : null + const zoneVisible = zone ? zone.visible !== false : (cache && cache.detectionZoneVisible === false ? false : true) + const platEd = this.allEntities && this.allEntities.find(e => e.type === 'platformIcon' && e.id === platformIconId) + entityData = { + type: 'detectionZone', + platformIconId, + zoneId, + zoneVisible, + roomId: (platEd && platEd.roomId) || currentRoomId, + platformId: platEd ? platEd.platformId : null + } + } + } else if (idStr.startsWith('detection-zone-')) { + // detection-zone-${routeId}-${zoneId} + const parts = idStr.split('-') + if (parts.length >= 4) { + const routeId = parts[2] + const zoneId = parts.slice(3).join('-') + const cache = this.platformCustomStyles && this.platformCustomStyles[routeId] + const zone = cache && Array.isArray(cache.detectionZones) ? cache.detectionZones.find(z => z && z.zoneId === zoneId) : null + const zoneVisible = zone ? zone.visible !== false : (cache && cache.detectionZoneVisible === false ? false : true) + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + entityData = { + type: 'detectionZone', + routeId, + zoneId, + zoneVisible, + roomId: currentRoomId, + platformId + } + } + } else if (idStr.startsWith('power-zone-platformIcon-')) { + const parts = idStr.split('-') + if (parts.length >= 5) { + const platformIconId = parts[3] + const zoneId = parts.slice(4).join('-') + const cache = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] + const zone = cache && Array.isArray(cache.powerZones) ? cache.powerZones.find(z => z && z.zoneId === zoneId) : null + const zoneVisible = zone ? zone.visible !== false : (cache && cache.powerZoneVisible === false ? false : true) + const platEd = this.allEntities && this.allEntities.find(e => e.type === 'platformIcon' && e.id === platformIconId) + entityData = { + type: 'powerZone', + platformIconId, + zoneId, + zoneVisible, + roomId: (platEd && platEd.roomId) || currentRoomId, + platformId: platEd ? platEd.platformId : null + } + } + } else if (idStr.startsWith('power-zone-')) { + // power-zone-${routeId}-${zoneId} + const parts = idStr.split('-') + if (parts.length >= 4) { + const routeId = parts[2] + const zoneId = parts.slice(3).join('-') + const cache = this.platformCustomStyles && this.platformCustomStyles[routeId] + const zone = cache && Array.isArray(cache.powerZones) ? cache.powerZones.find(z => z && z.zoneId === zoneId) : null + const zoneVisible = zone ? zone.visible !== false : (cache && cache.powerZoneVisible === false ? false : true) + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + entityData = { + type: 'powerZone', + routeId, + zoneId, + zoneVisible, + roomId: currentRoomId, + platformId + } + } + } + } + if (!entityData) { + // 查找对应的实体数据 + entityData = this.allEntities.find(e => e.entity === pickedEntity || e === pickedEntity) + // 特殊处理：如果点击的是线段上的点，找到对应的线实体 + if (!entityData) { + for (const lineEntity of this.allEntities) { + if (lineEntity.type === 'line' && lineEntity.pointEntities) { + if (lineEntity.pointEntities.includes(pickedEntity)) { + entityData = lineEntity + break + } + } + } + } + // 特殊处理：如果点击的是威力区的圆心，找到对应的威力区实体 + if (!entityData) { + for (const powerZoneEntity of this.allEntities) { + if (powerZoneEntity.type === 'powerZone' && powerZoneEntity.centerEntity === pickedEntity) { + entityData = powerZoneEntity + break + } + } + } + // 特殊处理：右键点击航点或航线时，从实体属性解析出 routeId；航点需区分为 routeWaypoint 以支持“向前/向后增加航点” + if (!entityData && pickedEntity.properties) { + const now = Cesium.JulianDate.now(); + const props = pickedEntity.properties.getValue ? pickedEntity.properties.getValue(now) : null; + if (props) { + const isWp = props.isMissionWaypoint && props.isMissionWaypoint.getValue ? props.isMissionWaypoint.getValue() : props.isMissionWaypoint; + const isLine = props.isMissionRouteLine && props.isMissionRouteLine.getValue ? props.isMissionRouteLine.getValue() : props.isMissionRouteLine; + if (isWp) { + let rId = props.routeId; + if (rId && rId.getValue) rId = rId.getValue(); + let dbId = props.dbId; + if (dbId && dbId.getValue) dbId = dbId.getValue(); + const ids = this._routeWaypointIdsByRoute && this._routeWaypointIdsByRoute[rId]; + const waypointIndex = ids && dbId != null ? ids.indexOf(dbId) : -1; + if (rId != null) entityData = { type: 'routeWaypoint', routeId: rId, dbId, waypointIndex }; + } else if (isLine) { + let rId = props.routeId; + if (rId && rId.getValue) rId = rId.getValue(); + if (rId) entityData = { type: 'route', routeId: rId }; + } + } + } + // 盘旋弧线（hold-line-routeId-i）右键视为在该盘旋航点处，i 为航点数组下标，waypointIndex = i + if (!entityData && idStr && idStr.startsWith('hold-line-')) { + const parts = idStr.split('-'); + if (parts.length >= 4) { + const routeId = parts[2]; + const segIdx = parseInt(parts[3], 10); + if (!isNaN(segIdx)) entityData = { type: 'routeWaypoint', routeId, waypointIndex: segIdx, fromHold: true }; + } + } + } + // 航线实体在 allEntities 中可能没有 routeId，从 id 解析 + if (entityData && entityData.type === 'route' && entityData.id && !entityData.routeId) { + entityData = { ...entityData, routeId: entityData.id.replace('route-line-', '') }; + } + for (const pick of drillPicks) { + const pickedEntity = pick.id || pick.object; + if (!pickedEntity || seenEntities.has(pickedEntity)) continue; + const entityData = this.resolveEntityDataFromPick(pickedEntity); if (entityData) { seenEntities.add(pickedEntity); pickList.push({ entityData, pickedEntity }); } + } } if (pickList.length > 0) { const { entityData, pickedEntity } = pickList[0]; @@ -5340,7 +5669,7 @@ export default { this.clickedOnEmpty = !Cesium.defined(picked) || !picked.id; if (picked && picked.id) { const idStr = typeof picked.id === 'string' ? picked.id : (picked.id.id || ''); - if (idStr.endsWith('-scale-frame')) { + if (idStr.endsWith('-scale-frame') || idStr.endsWith('-scale-frame-glow')) { this.clickedOnEmpty = false; return; } @@ -8925,21 +9254,60 @@ export default { const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId); if (currentRoomId) { - const styleData = { - roomId: String(currentRoomId), - routeId: routeId, - platformId: this.editPlatformForm.platformId, // 需要确保 openEditPlatformDialog 中设置了 platformId - platformName: this.editPlatformForm.platformName, // 需要确保 openEditPlatformDialog 中设置了 platformName - labelFontSize: fontSize, - labelFontColor: fontColor, - platformSize: Math.max(48, Math.min(256, Number(this.editPlatformForm.iconSize) || 144)), - platformColor: this.editPlatformForm.iconColor || '#000000' - }; + const platformId = this.editPlatformForm.platformId + const platformSize = Math.max(48, Math.min(256, Number(this.editPlatformForm.iconSize) || 144)) + const platformColor = this.editPlatformForm.iconColor || '#000000' + + // 保存标牌/平台样式时必须保留探测区/威力区 zones，避免被覆盖为 null + getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { + const existing = res.data || {} + const normalized = this.normalizeZonesFromStyle(existing) + const firstDetection = normalized.detectionZones[0] || null + const firstPower = normalized.powerZones[0] || null + + const styleData = { + ...existing, + roomId: String(currentRoomId), + routeId, + platformId, + platformName: this.editPlatformForm.platformName, + labelFontSize: fontSize, + labelFontColor: fontColor, + platformSize, + platformColor, + detectionZones: normalized.detectionZones, + powerZones: normalized.powerZones, + // 兼容旧逻辑 + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstPower ? firstPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : existing.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => { - this.$emit('platform-style-saved'); + this.$emit('platform-style-saved'); }).catch(err => { - console.error("样式保存失败", err); - }); + console.error("样式保存失败", err); + }) + }).catch(() => { + // 兜底：至少不影响编辑平台本身 + const styleData = { + roomId: String(currentRoomId), + routeId, + platformId, + platformName: this.editPlatformForm.platformName, + labelFontSize: fontSize, + labelFontColor: fontColor, + platformSize, + platformColor + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }) } if (this.viewer.scene && this.viewer.scene.requestRenderMode) { @@ -8963,26 +9331,29 @@ export default { const platformIconId = ed.id const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) const platformId = ed.platformId + const platformIconInstanceId = ed.serverId const cached = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] this.detectionZoneForm = { routeId: null, platformIconId, + platformIconInstanceId, roomId, platformId, radius: (cached && cached.detectionZoneRadius != null) ? Number(cached.detectionZoneRadius) : 50, color: (cached && cached.detectionZoneColor) ? cached.detectionZoneColor : 'rgba(0, 150, 255, 0.35)', opacity: (cached && cached.detectionZoneOpacity != null) ? Number(cached.detectionZoneOpacity) : 0.35, - visible: cached && cached.detectionZoneVisible === false ? false : true + visible: true } - if (roomId && platformId && !cached) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { + if (roomId && !cached) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: platformIconInstanceId || undefined } + getPlatformStyle(query).then(res => { const style = res.data if (style && (style.detectionZoneRadius != null || style.detectionZoneColor)) { this.detectionZoneForm.radius = style.detectionZoneRadius != null ? Number(style.detectionZoneRadius) : 50 this.detectionZoneForm.color = style.detectionZoneColor || 'rgba(0, 150, 255, 0.35)' this.detectionZoneForm.opacity = style.detectionZoneOpacity != null ? Number(style.detectionZoneOpacity) : 0.35 } - if (style && style.detectionZoneVisible === false) this.detectionZoneForm.visible = false + this.detectionZoneForm.visible = true this.detectionZoneDialogVisible = true }).catch(() => { this.detectionZoneDialogVisible = true }) } else { @@ -9001,7 +9372,7 @@ export default { radius: (cached && cached.detectionZoneRadius != null) ? Number(cached.detectionZoneRadius) : 50, color: (cached && cached.detectionZoneColor) ? cached.detectionZoneColor : 'rgba(0, 150, 255, 0.35)', opacity: (cached && cached.detectionZoneOpacity != null) ? Number(cached.detectionZoneOpacity) : 0.35, - visible: cached && cached.detectionZoneVisible === false ? false : true + visible: true } this.detectionZoneDialogVisible = true }, @@ -9018,20 +9389,23 @@ export default { const platformIconId = ed.id const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) const platformId = ed.platformId + const platformIconInstanceId = ed.serverId const cached = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] this.powerZoneForm = { routeId: null, platformIconId, + platformIconInstanceId, roomId, platformId, radius: (cached && cached.powerZoneRadius != null) ? Number(cached.powerZoneRadius) : 300, angle: (cached && cached.powerZoneAngle != null) ? Number(cached.powerZoneAngle) : 120, color: (cached && cached.powerZoneColor) ? cached.powerZoneColor : 'rgba(255, 0, 0, 0.3)', opacity: (cached && cached.powerZoneOpacity != null) ? Number(cached.powerZoneOpacity) : 0.3, - visible: cached && cached.powerZoneVisible === false ? false : true + visible: true } - if (roomId && platformId && !cached) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { + if (roomId && !cached) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: platformIconInstanceId || undefined } + getPlatformStyle(query).then(res => { const style = res.data if (style && (style.powerZoneRadius != null || style.powerZoneColor)) { this.powerZoneForm.radius = style.powerZoneRadius != null ? Number(style.powerZoneRadius) : 300 @@ -9039,7 +9413,7 @@ export default { this.powerZoneForm.color = style.powerZoneColor || 'rgba(255, 0, 0, 0.3)' this.powerZoneForm.opacity = style.powerZoneOpacity != null ? Number(style.powerZoneOpacity) : 0.3 } - if (style && style.powerZoneVisible === false) this.powerZoneForm.visible = false + this.powerZoneForm.visible = true this.powerZoneDialogVisible = true }).catch(() => { this.powerZoneDialogVisible = true }) } else { @@ -9059,7 +9433,7 @@ export default { angle: (cached && cached.powerZoneAngle != null) ? Number(cached.powerZoneAngle) : 120, color: (cached && cached.powerZoneColor) ? cached.powerZoneColor : 'rgba(255, 0, 0, 0.3)', opacity: (cached && cached.powerZoneOpacity != null) ? Number(cached.powerZoneOpacity) : 0.3, - visible: cached && cached.powerZoneVisible === false ? false : true + visible: true } this.powerZoneDialogVisible = true }, @@ -9067,15 +9441,30 @@ export default { /** * 以平台位置为中心绘制探测区整圆（供 applyDetectionZone 与 applyRedisPlatformStyles 复用） */ - ensureDetectionZoneForRoute(routeId, radiusKm, color, opacity) { + ensureDetectionZoneForRoute(routeId, arg1, arg2, arg3, arg4) { if (!routeId || !this.viewer) return const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) if (!platformEntity) return - const oldZoneId = `detection-zone-${routeId}` + let zoneId = 'legacy-detection-1' + let radiusKm = null + let color = null + let opacity = null + if (typeof arg1 === 'string') { + zoneId = arg1 + radiusKm = arg2 + color = arg3 + opacity = arg4 + } else { + radiusKm = arg1 + color = arg2 + opacity = arg3 + } + const oldZoneId = `detection-zone-${routeId}-${zoneId}` this.viewer.entities.removeById(oldZoneId) const radius = Number(radiusKm) || 50 const alpha = opacity != null ? Number(opacity) : 0.35 const fillColor = (color ? Cesium.Color.fromCssColorString(color) : new Cesium.Color(0, 0.59, 1, 1)).withAlpha(alpha) + const outlineAlpha = alpha > 0 ? 1.0 : 0.0 this.viewer.entities.add({ id: oldZoneId, position: new Cesium.CallbackProperty(() => { @@ -9087,7 +9476,7 @@ export default { semiMajorAxis: radius * 1000, material: fillColor, outline: true, - outlineColor: fillColor.clone().withAlpha(1.0), + outlineColor: fillColor.clone().withAlpha(outlineAlpha), outlineWidth: 2 } }) @@ -9104,18 +9493,36 @@ export default { * @param {string} color 填充颜色 * @param {number} opacity 透明度 0-1 */ - ensurePowerZoneForRoute(routeId, radiusKm, angleDeg, color, opacity) { + ensurePowerZoneForRoute(routeId, arg1, arg2, arg3, arg4, arg5) { if (!routeId || !this.viewer) return const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) const labelEntity = this.viewer.entities.getById(`route-platform-label-${routeId}`) if (!platformEntity) return - const oldZoneId = `power-zone-${routeId}` + let zoneId = 'legacy-power-1' + let radiusKm = null + let angleDeg = null + let color = null + let opacity = null + if (typeof arg1 === 'string') { + zoneId = arg1 + radiusKm = arg2 + angleDeg = arg3 + color = arg4 + opacity = arg5 + } else { + radiusKm = arg1 + angleDeg = arg2 + color = arg3 + opacity = arg4 + } + const oldZoneId = `power-zone-${routeId}-${zoneId}` this.viewer.entities.removeById(oldZoneId) const radiusMeters = (Number(radiusKm) || 300) * 1000 const angleRad = ((Number(angleDeg) || 120) * Math.PI) / 180 const halfAngle = angleRad / 2 const alpha = opacity != null ? Number(opacity) : 0.3 const fillColor = (color ? Cesium.Color.fromCssColorString(color) : new Cesium.Color(1, 0, 0, 1)).withAlpha(alpha) + const outlineAlpha = alpha > 0 ? 1.0 : 0.0 this.viewer.entities.add({ id: oldZoneId, polygon: { @@ -9134,7 +9541,7 @@ export default { }, false), material: fillColor, outline: true, - outlineColor: fillColor.clone().withAlpha(1.0), + outlineColor: fillColor.clone().withAlpha(outlineAlpha), outlineWidth: 2 } }) @@ -9146,15 +9553,30 @@ export default { /** * 以独立平台图标位置为中心绘制探测区整圆（routeId=0 存 Redis） */ - ensureDetectionZoneForPlatformIcon(platformIconId, radiusKm, color, opacity) { + ensureDetectionZoneForPlatformIcon(platformIconId, arg1, arg2, arg3, arg4) { if (!platformIconId || !this.viewer) return const platformEntity = this.viewer.entities.getById(platformIconId) if (!platformEntity) return - const oldZoneId = `detection-zone-platformIcon-${platformIconId}` + let zoneId = 'legacy-detection-1' + let radiusKm = null + let color = null + let opacity = null + if (typeof arg1 === 'string') { + zoneId = arg1 + radiusKm = arg2 + color = arg3 + opacity = arg4 + } else { + radiusKm = arg1 + color = arg2 + opacity = arg3 + } + const oldZoneId = `detection-zone-platformIcon-${platformIconId}-${zoneId}` this.viewer.entities.removeById(oldZoneId) const radius = Number(radiusKm) || 50 const alpha = opacity != null ? Number(opacity) : 0.35 const fillColor = (color ? Cesium.Color.fromCssColorString(color) : new Cesium.Color(0, 0.59, 1, 1)).withAlpha(alpha) + const outlineAlpha = alpha > 0 ? 1.0 : 0.0 this.viewer.entities.add({ id: oldZoneId, position: new Cesium.CallbackProperty(() => { @@ -9166,7 +9588,7 @@ export default { semiMajorAxis: radius * 1000, material: fillColor, outline: true, - outlineColor: fillColor.clone().withAlpha(1.0), + outlineColor: fillColor.clone().withAlpha(outlineAlpha), outlineWidth: 2 } }) @@ -9176,17 +9598,35 @@ export default { /** * 以独立平台图标位置与朝向绘制威力区扇形（routeId=0 存 Redis） */ - ensurePowerZoneForPlatformIcon(platformIconId, radiusKm, angleDeg, color, opacity) { + ensurePowerZoneForPlatformIcon(platformIconId, arg1, arg2, arg3, arg4, arg5) { if (!platformIconId || !this.viewer) return const platformEntity = this.viewer.entities.getById(platformIconId) if (!platformEntity) return - const oldZoneId = `power-zone-platformIcon-${platformIconId}` + let zoneId = 'legacy-power-1' + let radiusKm = null + let angleDeg = null + let color = null + let opacity = null + if (typeof arg1 === 'string') { + zoneId = arg1 + radiusKm = arg2 + angleDeg = arg3 + color = arg4 + opacity = arg5 + } else { + radiusKm = arg1 + angleDeg = arg2 + color = arg3 + opacity = arg4 + } + const oldZoneId = `power-zone-platformIcon-${platformIconId}-${zoneId}` this.viewer.entities.removeById(oldZoneId) const radiusMeters = (Number(radiusKm) || 300) * 1000 const angleRad = ((Number(angleDeg) || 120) * Math.PI) / 180 const halfAngle = angleRad / 2 const alpha = opacity != null ? Number(opacity) : 0.3 const fillColor = (color ? Cesium.Color.fromCssColorString(color) : new Cesium.Color(1, 0, 0, 1)).withAlpha(alpha) + const outlineAlpha = alpha > 0 ? 1.0 : 0.0 this.viewer.entities.add({ id: oldZoneId, polygon: { @@ -9205,7 +9645,7 @@ export default { }, false), material: fillColor, outline: true, - outlineColor: fillColor.clone().withAlpha(1.0), + outlineColor: fillColor.clone().withAlpha(outlineAlpha), outlineWidth: 2 } }) @@ -9221,42 +9661,87 @@ export default { this.detectionZoneDialogVisible = false return } - const radius = this.detectionZoneForm.radius + const radiusKm = Number(this.detectionZoneForm.radius) || 50 const color = this.detectionZoneForm.color const opacity = this.detectionZoneForm.opacity != null ? Number(this.detectionZoneForm.opacity) : 0.35 - if (visible) { - this.ensureDetectionZoneForPlatformIcon(platformIconId, radius, color, opacity) - this.$message.success(`已添加半径 ${radius} 千米的探测区`) - } else { - this.viewer.entities.removeById(`detection-zone-platformIcon-${platformIconId}`) - this.$message.success('已隐藏探测区') + const zoneId = this.generateZoneId() + + const newZone = { + zoneId, + radiusKm, + color, + opacity, + visible } + + // 1) 更新前端缓存（支持多 zone 叠加） + const cache = this.platformIconZoneStyles[platformIconId] || {} + const normalized = this.normalizeZonesFromStyle(cache) + const nextDetectionZones = [...(normalized.detectionZones || []), newZone] + const nextPowerZones = normalized.powerZones || [] + const firstDetection = nextDetectionZones[0] || null + const firstPower = nextPowerZones[0] || null + this.$set(this.platformIconZoneStyles, platformIconId, { - ...this.platformIconZoneStyles[platformIconId], - detectionZoneRadius: radius, - detectionZoneColor: color, - detectionZoneOpacity: opacity, - detectionZoneVisible: visible + ...cache, + detectionZones: nextDetectionZones, + powerZones: nextPowerZones, + // 兼容旧逻辑：取第一个 zone 作为“单区字段” + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : null, + detectionZoneColor: firstDetection ? firstDetection.color : null, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : null, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : false, + powerZoneRadius: firstPower ? firstPower.radiusKm : null, + powerZoneAngle: firstPower ? firstPower.angleDeg : null, + powerZoneColor: firstPower ? firstPower.color : null, + powerZoneOpacity: firstPower ? firstPower.opacity : null, + powerZoneVisible: firstPower ? firstPower.visible !== false : false }) + + // 2) 绘制（只绘制 visible 的 zone；隐藏的仍保留在数组里） + if (visible) { + this.ensureDetectionZoneForPlatformIcon(platformIconId, zoneId, radiusKm, color, opacity) + } else { + // 创建实体以支持后续再次显示（通过右键探测区实体切换） + this.ensureDetectionZoneForPlatformIcon(platformIconId, zoneId, radiusKm, color, 0) + } + this.detectionZoneDialogVisible = false - if (roomId && platformId) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { + + // 3) 持久化到 Redis：按实例存储，合并已有 zones + if (roomId && (this.detectionZoneForm.platformIconInstanceId != null || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: this.detectionZoneForm.platformIconInstanceId || undefined } + getPlatformStyle(query).then(res => { const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const savedDetectionZones = [...(existingNormalized.detectionZones || []), newZone] + const savedPowerZones = existingNormalized.powerZones || [] + + const firstSavedDetection = savedDetectionZones[0] || null + const firstSavedPower = savedPowerZones[0] || null + const styleData = { + ...existing, roomId: String(roomId), routeId: 0, - platformId, + platformId: platformId || undefined, + platformIconInstanceId: this.detectionZoneForm.platformIconInstanceId || undefined, platformName: existing.platformName || undefined, - detectionZoneRadius: radius, - detectionZoneColor: color, - detectionZoneOpacity: opacity, - detectionZoneVisible: visible, - powerZoneRadius: existing.powerZoneRadius, - powerZoneAngle: existing.powerZoneAngle, - powerZoneColor: existing.powerZoneColor, - powerZoneOpacity: existing.powerZoneOpacity, - powerZoneVisible: existing.powerZoneVisible + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + + // 兼容旧逻辑：同步单区字段 + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) }).catch(() => {}) } @@ -9286,55 +9771,89 @@ export default { const now = Cesium.JulianDate.now() platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId } - const radius = this.detectionZoneForm.radius + const radiusKm = Number(this.detectionZoneForm.radius) || 50 const color = this.detectionZoneForm.color const opacity = this.detectionZoneForm.opacity != null ? Number(this.detectionZoneForm.opacity) : 0.35 const visible = this.detectionZoneForm.visible !== false + const zoneId = this.generateZoneId() - const doDrawAndClose = () => { - if (visible) { - this.ensureDetectionZoneForRoute(routeId, radius, color, opacity) - this.$message.success(`已添加半径 ${radius} 千米的探测区`) - } else { - this.viewer.entities.removeById(`detection-zone-${routeId}`) - this.$message.success('已隐藏探测区') - } - this.$set(this.platformCustomStyles, routeId, { - ...this.platformCustomStyles[routeId], - detectionZoneRadius: radius, - detectionZoneColor: color, - detectionZoneOpacity: opacity, - detectionZoneVisible: visible - }) - this.detectionZoneDialogVisible = false + const newZone = { + zoneId, + radiusKm, + color, + opacity, + visible + } + + // 1) 更新前端缓存：把新的探测区追加到数组里（不覆盖） + const cache = this.platformCustomStyles[routeId] || {} + const normalized = this.normalizeZonesFromStyle(cache) + const nextDetectionZones = [...(normalized.detectionZones || []), newZone] + const nextPowerZones = normalized.powerZones || [] + const firstDetection = nextDetectionZones[0] || null + const firstPower = nextPowerZones[0] || null + + this.$set(this.platformCustomStyles, routeId, { + ...cache, + detectionZones: nextDetectionZones, + powerZones: nextPowerZones, + // 兼容旧逻辑：取第一个 zone 作为“单区字段” + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : cache.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : cache.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : cache.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : (cache.detectionZoneVisible !== false), + powerZoneRadius: firstPower ? firstPower.radiusKm : cache.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : cache.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : cache.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : cache.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : (cache.powerZoneVisible !== false) + }) + + // 2) 绘制：visible 才落到 Cesium（hidden 的保留在数组里） + if (visible) { + this.ensureDetectionZoneForRoute(routeId, zoneId, radiusKm, color, opacity) + } else { + // 创建实体以支持后续再次显示（opacity=0 隐藏但可再次切换） + this.ensureDetectionZoneForRoute(routeId, zoneId, radiusKm, color, 0) } + this.detectionZoneDialogVisible = false + + // 3) 持久化：合并已有 zones，避免覆盖其他 zone if (currentRoomId && Number(platformId) > 0) { getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const savedDetectionZones = [...(existingNormalized.detectionZones || []), newZone] + const savedPowerZones = existingNormalized.powerZones || [] + + const firstSavedDetection = savedDetectionZones[0] || null + const firstSavedPower = savedPowerZones[0] || null + const styleData = { + ...existing, roomId: String(currentRoomId), routeId, platformId, platformName: existing.platformName || undefined, - labelFontSize: existing.labelFontSize, - labelFontColor: existing.labelFontColor, - platformSize: existing.platformSize, - platformColor: existing.platformColor, - detectionZoneRadius: radius, - detectionZoneColor: color, - detectionZoneOpacity: opacity, - detectionZoneVisible: visible, - powerZoneRadius: existing.powerZoneRadius, - powerZoneAngle: existing.powerZoneAngle, - powerZoneColor: existing.powerZoneColor, - powerZoneOpacity: existing.powerZoneOpacity, - powerZoneVisible: existing.powerZoneVisible - } - savePlatformStyle(styleData).then(() => { this.$emit('platform-style-saved'); doDrawAndClose(); }).catch(() => doDrawAndClose()) - }).catch(() => doDrawAndClose()) - } else { - doDrawAndClose() + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + + // 兼容旧逻辑：同步单区字段 + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) } }, @@ -9347,44 +9866,90 @@ export default { this.powerZoneDialogVisible = false return } - const radius = this.powerZoneForm.radius - const angle = this.powerZoneForm.angle + const radiusKm = Number(this.powerZoneForm.radius) || 300 + const angleDeg = Number(this.powerZoneForm.angle) || 120 const color = this.powerZoneForm.color const opacity = this.powerZoneForm.opacity != null ? Number(this.powerZoneForm.opacity) : 0.3 - if (visible) { - this.ensurePowerZoneForPlatformIcon(platformIconId, radius, angle, color, opacity) - this.$message.success(`已添加半径 ${radius} 千米、夹角 ${angle}° 的威力区`) - } else { - this.viewer.entities.removeById(`power-zone-platformIcon-${platformIconId}`) - this.$message.success('已隐藏威力区') + const zoneId = this.generateZoneId() + + const newZone = { + zoneId, + radiusKm, + angleDeg, + color, + opacity, + visible } + + // 1) 更新前端缓存：把新的威力区追加到数组里（不覆盖） + const cache = this.platformIconZoneStyles[platformIconId] || {} + const normalized = this.normalizeZonesFromStyle(cache) + const nextDetectionZones = normalized.detectionZones || [] + const nextPowerZones = [...(normalized.powerZones || []), newZone] + const firstDetection = nextDetectionZones[0] || null + const firstPower = nextPowerZones[0] || null + this.$set(this.platformIconZoneStyles, platformIconId, { - ...this.platformIconZoneStyles[platformIconId], - powerZoneRadius: radius, - powerZoneAngle: angle, - powerZoneColor: color, - powerZoneOpacity: opacity, - powerZoneVisible: visible + ...cache, + detectionZones: nextDetectionZones, + powerZones: nextPowerZones, + // 兼容旧逻辑：取第一个 zone 作为“单区字段” + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : cache.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : cache.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : cache.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : (cache.detectionZoneVisible !== false), + powerZoneRadius: firstPower ? firstPower.radiusKm : cache.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : cache.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : cache.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : cache.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : (cache.powerZoneVisible !== false) }) + + // 2) 绘制：visible 才落到 Cesium（hidden 的保留在数组里） + if (visible) { + this.ensurePowerZoneForPlatformIcon(platformIconId, zoneId, radiusKm, angleDeg, color, opacity) + } else { + // 创建实体以支持后续再次显示（opacity=0 隐藏但可再次切换） + this.ensurePowerZoneForPlatformIcon(platformIconId, zoneId, radiusKm, angleDeg, color, 0) + } + this.powerZoneDialogVisible = false - if (roomId && platformId) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { + + // 3) 持久化：按实例存储，合并已有 zones + if (roomId && (this.powerZoneForm.platformIconInstanceId != null || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: this.powerZoneForm.platformIconInstanceId || undefined } + getPlatformStyle(query).then(res => { const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const savedDetectionZones = existingNormalized.detectionZones || [] + const savedPowerZones = [...(existingNormalized.powerZones || []), newZone] + + const firstSavedDetection = savedDetectionZones[0] || null + const firstSavedPower = savedPowerZones[0] || null + const styleData = { + ...existing, roomId: String(roomId), routeId: 0, - platformId, + platformId: platformId || undefined, + platformIconInstanceId: this.powerZoneForm.platformIconInstanceId || undefined, platformName: existing.platformName || undefined, - detectionZoneRadius: existing.detectionZoneRadius, - detectionZoneColor: existing.detectionZoneColor, - detectionZoneOpacity: existing.detectionZoneOpacity, - detectionZoneVisible: existing.detectionZoneVisible, - powerZoneRadius: radius, - powerZoneAngle: angle, - powerZoneColor: color, - powerZoneOpacity: opacity, - powerZoneVisible: visible + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + + // 兼容旧逻辑：同步单区字段 + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) }).catch(() => {}) } @@ -9414,57 +9979,91 @@ export default { const now = Cesium.JulianDate.now() platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId } - const radius = this.powerZoneForm.radius - const angle = this.powerZoneForm.angle + const radiusKm = Number(this.powerZoneForm.radius) || 300 + const angleDeg = Number(this.powerZoneForm.angle) || 120 const color = this.powerZoneForm.color const opacity = this.powerZoneForm.opacity != null ? Number(this.powerZoneForm.opacity) : 0.3 const visible = this.powerZoneForm.visible !== false + const zoneId = this.generateZoneId() - const doDrawAndClose = () => { - if (visible) { - this.ensurePowerZoneForRoute(routeId, radius, angle, color, opacity) - this.$message.success(`已添加半径 ${radius} 千米、夹角 ${angle}° 的威力区`) - } else { - this.viewer.entities.removeById(`power-zone-${routeId}`) - this.$message.success('已隐藏威力区') - } - this.$set(this.platformCustomStyles, routeId, { - ...this.platformCustomStyles[routeId], - powerZoneRadius: radius, - powerZoneAngle: angle, - powerZoneColor: color, - powerZoneOpacity: opacity, - powerZoneVisible: visible - }) - this.powerZoneDialogVisible = false + const newZone = { + zoneId, + radiusKm, + angleDeg, + color, + opacity, + visible } + // 1) 更新前端缓存：把新的威力区追加到数组里（不覆盖） + const cache = this.platformCustomStyles[routeId] || {} + const normalized = this.normalizeZonesFromStyle(cache) + const nextDetectionZones = normalized.detectionZones || [] + const nextPowerZones = [...(normalized.powerZones || []), newZone] + const firstDetection = nextDetectionZones[0] || null + const firstPower = nextPowerZones[0] || null + + this.$set(this.platformCustomStyles, routeId, { + ...cache, + detectionZones: nextDetectionZones, + powerZones: nextPowerZones, + // 兼容旧逻辑：取第一个 zone 作为“单区字段” + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : cache.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : cache.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : cache.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : (cache.detectionZoneVisible !== false), + powerZoneRadius: firstPower ? firstPower.radiusKm : cache.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : cache.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : cache.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : cache.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : (cache.powerZoneVisible !== false) + }) + + // 2) 绘制：visible 才落到 Cesium + if (visible) { + this.ensurePowerZoneForRoute(routeId, zoneId, radiusKm, angleDeg, color, opacity) + } else { + // 创建实体以支持后续再次显示（opacity=0 隐藏但可再次切换） + this.ensurePowerZoneForRoute(routeId, zoneId, radiusKm, angleDeg, color, 0) + } + + this.powerZoneDialogVisible = false + + // 3) 持久化：合并已有 zones，避免覆盖其他 zone if (currentRoomId && Number(platformId) > 0) { getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const savedDetectionZones = existingNormalized.detectionZones || [] + const savedPowerZones = [...(existingNormalized.powerZones || []), newZone] + + const firstSavedDetection = savedDetectionZones[0] || null + const firstSavedPower = savedPowerZones[0] || null + const styleData = { + ...existing, roomId: String(currentRoomId), routeId, platformId, platformName: existing.platformName || undefined, - labelFontSize: existing.labelFontSize, - labelFontColor: existing.labelFontColor, - platformSize: existing.platformSize, - platformColor: existing.platformColor, - detectionZoneRadius: existing.detectionZoneRadius, - detectionZoneColor: existing.detectionZoneColor, - detectionZoneOpacity: existing.detectionZoneOpacity, - detectionZoneVisible: existing.detectionZoneVisible, - powerZoneRadius: radius, - powerZoneAngle: angle, - powerZoneColor: color, - powerZoneOpacity: opacity, - powerZoneVisible: visible - } - savePlatformStyle(styleData).then(() => { this.$emit('platform-style-saved'); doDrawAndClose(); }).catch(() => doDrawAndClose()) - }).catch(() => doDrawAndClose()) - } else { - doDrawAndClose() + detectionZones: savedDetectionZones, + powerZones: savedPowerZones, + + // 兼容旧逻辑：同步单区字段 + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) } }, @@ -9473,59 +10072,234 @@ export default { const ed = this.contextMenu.entityData this.contextMenu.visible = false if (!ed || !this.viewer) return - if (ed.type === 'routePlatform' && ed.routeId != null) { - const routeId = ed.routeId - const c = this.platformCustomStyles && this.platformCustomStyles[routeId] - const nextVisible = c && c.detectionZoneVisible === false - const radius = (c && c.detectionZoneRadius != null) ? Number(c.detectionZoneRadius) : 50 - const color = (c && c.detectionZoneColor) || 'rgba(0, 150, 255, 0.35)' - const opacity = (c && c.detectionZoneOpacity != null) ? Number(c.detectionZoneOpacity) : 0.35 - if (nextVisible) { - this.ensureDetectionZoneForRoute(routeId, radius, color, opacity) - this.$message.success('已显示探测区') + // 1) 单个区：右键探测区实体时触发 + if (ed.type === 'detectionZone' && ed.zoneId && (ed.routeId != null || ed.platformIconId)) { + const nextVisible = ed.zoneVisible === false + if (ed.routeId != null) { + const routeId = ed.routeId + const zoneId = ed.zoneId + const c = this.platformCustomStyles && this.platformCustomStyles[routeId] + const zone = c && Array.isArray(c.detectionZones) ? c.detectionZones.find(z => z && z.zoneId === zoneId) : null + if (!zone) return + if (nextVisible) { + this.ensureDetectionZoneForRoute(routeId, zoneId, zone.radiusKm, zone.color, zone.opacity) + } else { + // 保留实体用于再次点击显示：将透明度降为 0（outline 同步为 0） + this.ensureDetectionZoneForRoute(routeId, zoneId, zone.radiusKm, zone.color, 0) + } + // 更新缓存 + this.$set(this.platformCustomStyles, routeId, { + ...this.platformCustomStyles[routeId], + detectionZones: c.detectionZones.map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + }) + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + if (currentRoomId && Number(platformId) > 0) { + getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextDetectionZones = (existingNormalized.detectionZones || []).map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + const firstSavedDetection = nextDetectionZones[0] || null + const firstSavedPower = (existingNormalized.powerZones || [])[0] || null + const styleData = { + ...existing, + roomId: currentRoomId, + routeId, + platformId, + detectionZones: nextDetectionZones, + powerZones: existingNormalized.powerZones || [], + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } else { - this.viewer.entities.removeById(`detection-zone-${routeId}`) - this.$message.success('已隐藏探测区') - } - this.$set(this.platformCustomStyles, routeId, { ...this.platformCustomStyles[routeId], detectionZoneVisible: nextVisible }) - const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) - let platformId = 0 - if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { - const now = Cesium.JulianDate.now() - platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + const platformIconId = ed.platformIconId + const zoneId = ed.zoneId + const c = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] + const zone = c && Array.isArray(c.detectionZones) ? c.detectionZones.find(z => z && z.zoneId === zoneId) : null + if (!zone) return + if (nextVisible) { + this.ensureDetectionZoneForPlatformIcon(platformIconId, zoneId, zone.radiusKm, zone.color, zone.opacity) + } else { + this.ensureDetectionZoneForPlatformIcon(platformIconId, zoneId, zone.radiusKm, zone.color, 0) + } + // 更新缓存 + this.$set(this.platformIconZoneStyles, platformIconId, { + ...this.platformIconZoneStyles[platformIconId], + detectionZones: c.detectionZones.map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + }) + const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + const platformId = ed.platformId + const instanceId = platformIconId && platformIconId.startsWith('platformIcon_room_') ? platformIconId.split('_').pop() : null + if (roomId && (instanceId || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: instanceId || undefined } + getPlatformStyle(query).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextDetectionZones = (existingNormalized.detectionZones || []).map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + const firstSavedDetection = nextDetectionZones[0] || null + const firstSavedPower = (existingNormalized.powerZones || [])[0] || null + const styleData = { + ...existing, + roomId: String(roomId), + routeId: 0, + platformId: platformId || undefined, + platformIconInstanceId: instanceId || undefined, + detectionZones: nextDetectionZones, + powerZones: existingNormalized.powerZones || [], + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } - const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) - if (currentRoomId && Number(platformId) > 0) { - getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { - const existing = res.data || {} - savePlatformStyle({ ...existing, roomId: currentRoomId, routeId, platformId, detectionZoneVisible: nextVisible }).then(() => this.$emit('platform-style-saved')).catch(() => {}) - }).catch(() => {}) + return + } + + // 2) 平台级：右键平台图标/航线飞机时，切换该平台所有探测区（整体显隐） + const toggleAll = (targetType) => { + const anyVisible = targetType === 'route' + ? this.platformCustomStyles && this.platformCustomStyles[ed.routeId] && Array.isArray(this.platformCustomStyles[ed.routeId].detectionZones) + ? this.platformCustomStyles[ed.routeId].detectionZones.some(z => z && z.visible !== false) + : false + : this.platformIconZoneStyles && this.platformIconZoneStyles[ed.id] && Array.isArray(this.platformIconZoneStyles[ed.id].detectionZones) + ? this.platformIconZoneStyles[ed.id].detectionZones.some(z => z && z.visible !== false) + : false + + const nextVisible = !anyVisible + + if (targetType === 'route') { + const routeId = ed.routeId + const c = this.platformCustomStyles[routeId] || {} + const zones = Array.isArray(c.detectionZones) ? c.detectionZones : this.normalizeDetectionZonesFromStyle(c) + zones.forEach(z => { + if (!z) return + if (nextVisible) { + if (z.radiusKm == null || Number(z.radiusKm) <= 0) return + this.ensureDetectionZoneForRoute(routeId, z.zoneId, z.radiusKm, z.color, z.opacity) + } else { + this.ensureDetectionZoneForRoute(routeId, z.zoneId, z.radiusKm, z.color, 0) + } + }) + this.$set(this.platformCustomStyles, routeId, { + ...this.platformCustomStyles[routeId], + detectionZones: zones.map(z => ({ ...z, visible: nextVisible })) + }) + + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + if (currentRoomId && Number(platformId) > 0) { + getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextDetectionZones = (existingNormalized.detectionZones || []).map(z => ({ ...z, visible: nextVisible })) + const firstSavedDetection = nextDetectionZones[0] || null + const firstSavedPower = (existingNormalized.powerZones || [])[0] || null + const styleData = { + ...existing, + roomId: currentRoomId, + routeId, + platformId, + detectionZones: nextDetectionZones, + powerZones: existingNormalized.powerZones || [], + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } + } else if (targetType === 'platformIcon') { + const platformIconId = ed.id + const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + const platformId = ed.platformId + const instanceId = platformIconId && platformIconId.startsWith('platformIcon_room_') ? platformIconId.split('_').pop() : null + const c = this.platformIconZoneStyles[platformIconId] || {} + const zones = Array.isArray(c.detectionZones) ? c.detectionZones : this.normalizeDetectionZonesFromStyle(c) + zones.forEach(z => { + if (!z) return + if (nextVisible) { + if (z.radiusKm == null || Number(z.radiusKm) <= 0) return + this.ensureDetectionZoneForPlatformIcon(platformIconId, z.zoneId, z.radiusKm, z.color, z.opacity) + } else { + this.ensureDetectionZoneForPlatformIcon(platformIconId, z.zoneId, z.radiusKm, z.color, 0) + } + }) + this.$set(this.platformIconZoneStyles, platformIconId, { + ...this.platformIconZoneStyles[platformIconId], + detectionZones: zones.map(z => ({ ...z, visible: nextVisible })) + }) + if (roomId && (instanceId || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: instanceId || undefined } + getPlatformStyle(query).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextDetectionZones = (existingNormalized.detectionZones || []).map(z => ({ ...z, visible: nextVisible })) + const firstSavedDetection = nextDetectionZones[0] || null + const firstSavedPower = (existingNormalized.powerZones || [])[0] || null + const styleData = { + ...existing, + roomId: String(roomId), + routeId: 0, + platformId: platformId || undefined, + platformIconInstanceId: instanceId || undefined, + detectionZones: nextDetectionZones, + powerZones: existingNormalized.powerZones || [], + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } + } + + if (ed.type === 'routePlatform' && ed.routeId != null) { + toggleAll('route') return } if (ed.type === 'platformIcon' && ed.id) { - const platformIconId = ed.id - const c = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] - const nextVisible = c && c.detectionZoneVisible === false - const radius = (c && c.detectionZoneRadius != null) ? Number(c.detectionZoneRadius) : 50 - const color = (c && c.detectionZoneColor) || 'rgba(0, 150, 255, 0.35)' - const opacity = (c && c.detectionZoneOpacity != null) ? Number(c.detectionZoneOpacity) : 0.35 - if (nextVisible) { - this.ensureDetectionZoneForPlatformIcon(platformIconId, radius, color, opacity) - this.$message.success('已显示探测区') - } else { - this.viewer.entities.removeById(`detection-zone-platformIcon-${platformIconId}`) - this.$message.success('已隐藏探测区') - } - this.$set(this.platformIconZoneStyles, platformIconId, { ...this.platformIconZoneStyles[platformIconId], detectionZoneVisible: nextVisible }) - const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) - const platformId = ed.platformId - if (roomId && platformId) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { - const existing = res.data || {} - savePlatformStyle({ ...existing, roomId: String(roomId), routeId: 0, platformId, detectionZoneVisible: nextVisible }).then(() => this.$emit('platform-style-saved')).catch(() => {}) - }).catch(() => {}) - } + toggleAll('platformIcon') } }, @@ -9534,61 +10308,237 @@ export default { const ed = this.contextMenu.entityData this.contextMenu.visible = false if (!ed || !this.viewer) return - if (ed.type === 'routePlatform' && ed.routeId != null) { - const routeId = ed.routeId - const c = this.platformCustomStyles && this.platformCustomStyles[routeId] - const nextVisible = c && c.powerZoneVisible === false - const radius = (c && c.powerZoneRadius != null) ? Number(c.powerZoneRadius) : 300 - const angle = (c && c.powerZoneAngle != null) ? Number(c.powerZoneAngle) : 120 - const color = (c && c.powerZoneColor) || 'rgba(255, 0, 0, 0.3)' - const opacity = (c && c.powerZoneOpacity != null) ? Number(c.powerZoneOpacity) : 0.3 - if (nextVisible) { - this.ensurePowerZoneForRoute(routeId, radius, angle, color, opacity) - this.$message.success('已显示威力区') + // 单个区：右键威力区实体时触发 + if (ed.type === 'powerZone' && ed.zoneId && (ed.routeId != null || ed.platformIconId)) { + const nextVisible = ed.zoneVisible === false + if (ed.routeId != null) { + const routeId = ed.routeId + const zoneId = ed.zoneId + const c = this.platformCustomStyles && this.platformCustomStyles[routeId] + const zone = c && Array.isArray(c.powerZones) ? c.powerZones.find(z => z && z.zoneId === zoneId) : null + if (!zone) return + if (nextVisible) { + this.ensurePowerZoneForRoute(routeId, zoneId, zone.radiusKm, zone.angleDeg, zone.color, zone.opacity) + } else { + this.ensurePowerZoneForRoute(routeId, zoneId, zone.radiusKm, zone.angleDeg, zone.color, 0) + } + this.$set(this.platformCustomStyles, routeId, { + ...this.platformCustomStyles[routeId], + powerZones: c.powerZones.map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + }) + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + if (currentRoomId && Number(platformId) > 0) { + getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextPowerZones = (existingNormalized.powerZones || []).map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + const firstSavedDetection = (existingNormalized.detectionZones || [])[0] || null + const firstSavedPower = nextPowerZones[0] || null + const styleData = { + ...existing, + roomId: currentRoomId, + routeId, + platformId, + detectionZones: existingNormalized.detectionZones || [], + powerZones: nextPowerZones, + + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } else { - this.viewer.entities.removeById(`power-zone-${routeId}`) - this.$message.success('已隐藏威力区') - } - this.$set(this.platformCustomStyles, routeId, { ...this.platformCustomStyles[routeId], powerZoneVisible: nextVisible }) - const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) - let platformId = 0 - if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { - const now = Cesium.JulianDate.now() - platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + const platformIconId = ed.platformIconId + const zoneId = ed.zoneId + const c = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] + const zone = c && Array.isArray(c.powerZones) ? c.powerZones.find(z => z && z.zoneId === zoneId) : null + if (!zone) return + if (nextVisible) { + this.ensurePowerZoneForPlatformIcon(platformIconId, zoneId, zone.radiusKm, zone.angleDeg, zone.color, zone.opacity) + } else { + this.ensurePowerZoneForPlatformIcon(platformIconId, zoneId, zone.radiusKm, zone.angleDeg, zone.color, 0) + } + this.$set(this.platformIconZoneStyles, platformIconId, { + ...this.platformIconZoneStyles[platformIconId], + powerZones: c.powerZones.map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + }) + const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + const platformId = ed.platformId + const instanceId = platformIconId && platformIconId.startsWith('platformIcon_room_') ? platformIconId.split('_').pop() : null + if (roomId && (instanceId || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: instanceId || undefined } + getPlatformStyle(query).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextPowerZones = (existingNormalized.powerZones || []).map(z => (z.zoneId === zoneId ? { ...z, visible: nextVisible } : z)) + const firstSavedDetection = (existingNormalized.detectionZones || [])[0] || null + const firstSavedPower = nextPowerZones[0] || null + const styleData = { + ...existing, + roomId: String(roomId), + routeId: 0, + platformId: platformId || undefined, + platformIconInstanceId: instanceId || undefined, + detectionZones: existingNormalized.detectionZones || [], + powerZones: nextPowerZones, + + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } - const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) - if (currentRoomId && Number(platformId) > 0) { - getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { - const existing = res.data || {} - savePlatformStyle({ ...existing, roomId: currentRoomId, routeId, platformId, powerZoneVisible: nextVisible }).then(() => this.$emit('platform-style-saved')).catch(() => {}) - }).catch(() => {}) + return + } + + // 平台级：切换该平台所有威力区（整体显隐） + const toggleAll = (targetType) => { + const anyVisible = targetType === 'route' + ? this.platformCustomStyles && this.platformCustomStyles[ed.routeId] && Array.isArray(this.platformCustomStyles[ed.routeId].powerZones) + ? this.platformCustomStyles[ed.routeId].powerZones.some(z => z && z.visible !== false) + : false + : this.platformIconZoneStyles && this.platformIconZoneStyles[ed.id] && Array.isArray(this.platformIconZoneStyles[ed.id].powerZones) + ? this.platformIconZoneStyles[ed.id].powerZones.some(z => z && z.visible !== false) + : false + const nextVisible = !anyVisible + + if (targetType === 'route') { + const routeId = ed.routeId + const c = this.platformCustomStyles[routeId] || {} + const zones = Array.isArray(c.powerZones) ? c.powerZones : this.normalizePowerZonesFromStyle(c) + zones.forEach(z => { + if (!z) return + if (nextVisible) { + if (z.radiusKm == null || Number(z.radiusKm) <= 0) return + this.ensurePowerZoneForRoute(routeId, z.zoneId, z.radiusKm, z.angleDeg ?? 120, z.color, z.opacity) + } else { + this.ensurePowerZoneForRoute(routeId, z.zoneId, z.radiusKm, z.angleDeg ?? 120, z.color, 0) + } + }) + this.$set(this.platformCustomStyles, routeId, { + ...this.platformCustomStyles[routeId], + powerZones: zones.map(z => ({ ...z, visible: nextVisible })) + }) + const platformEntity = this.viewer.entities.getById(`route-platform-${routeId}`) + let platformId = 0 + if (platformEntity && platformEntity.properties && platformEntity.properties.platformId) { + const now = Cesium.JulianDate.now() + platformId = platformEntity.properties.platformId.getValue ? platformEntity.properties.platformId.getValue(now) : platformEntity.properties.platformId + } + const currentRoomId = this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + if (currentRoomId && Number(platformId) > 0) { + getPlatformStyle({ roomId: currentRoomId, routeId, platformId }).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextPowerZones = (existingNormalized.powerZones || []).map(z => ({ ...z, visible: nextVisible })) + const firstSavedDetection = (existingNormalized.detectionZones || [])[0] || null + const firstSavedPower = nextPowerZones[0] || null + const styleData = { + ...existing, + roomId: currentRoomId, + routeId, + platformId, + detectionZones: existingNormalized.detectionZones || [], + powerZones: nextPowerZones, + + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } + } else if (targetType === 'platformIcon') { + const platformIconId = ed.id + const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + const platformId = ed.platformId + const c = this.platformIconZoneStyles[platformIconId] || {} + const zones = Array.isArray(c.powerZones) ? c.powerZones : this.normalizePowerZonesFromStyle(c) + zones.forEach(z => { + if (!z) return + if (nextVisible) { + if (z.radiusKm == null || Number(z.radiusKm) <= 0) return + this.ensurePowerZoneForPlatformIcon(platformIconId, z.zoneId, z.radiusKm, z.angleDeg ?? 120, z.color, z.opacity) + } else { + this.ensurePowerZoneForPlatformIcon(platformIconId, z.zoneId, z.radiusKm, z.angleDeg ?? 120, z.color, 0) + } + }) + this.$set(this.platformIconZoneStyles, platformIconId, { + ...this.platformIconZoneStyles[platformIconId], + powerZones: zones.map(z => ({ ...z, visible: nextVisible })) + }) + const instanceId = platformIconId && platformIconId.startsWith('platformIcon_room_') ? platformIconId.split('_').pop() : null + if (roomId && (instanceId || platformId)) { + const query = { roomId, routeId: 0, platformId: platformId || undefined, platformIconInstanceId: instanceId || undefined } + getPlatformStyle(query).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + const nextPowerZones = (existingNormalized.powerZones || []).map(z => ({ ...z, visible: nextVisible })) + const firstSavedDetection = (existingNormalized.detectionZones || [])[0] || null + const firstSavedPower = nextPowerZones[0] || null + const styleData = { + ...existing, + roomId: String(roomId), + routeId: 0, + platformId: platformId || undefined, + platformIconInstanceId: instanceId || undefined, + detectionZones: existingNormalized.detectionZones || [], + powerZones: nextPowerZones, + + detectionZoneRadius: firstSavedDetection ? firstSavedDetection.radiusKm : existing.detectionZoneRadius, + detectionZoneColor: firstSavedDetection ? firstSavedDetection.color : existing.detectionZoneColor, + detectionZoneOpacity: firstSavedDetection ? firstSavedDetection.opacity : existing.detectionZoneOpacity, + detectionZoneVisible: firstSavedDetection ? firstSavedDetection.visible !== false : existing.detectionZoneVisible, + + powerZoneRadius: firstSavedPower ? firstSavedPower.radiusKm : existing.powerZoneRadius, + powerZoneAngle: firstSavedPower ? firstSavedPower.angleDeg : existing.powerZoneAngle, + powerZoneColor: firstSavedPower ? firstSavedPower.color : existing.powerZoneColor, + powerZoneOpacity: firstSavedPower ? firstSavedPower.opacity : existing.powerZoneOpacity, + powerZoneVisible: firstSavedPower ? firstSavedPower.visible !== false : existing.powerZoneVisible + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } + } + + if (ed.type === 'routePlatform' && ed.routeId != null) { + toggleAll('route') return } if (ed.type === 'platformIcon' && ed.id) { - const platformIconId = ed.id - const c = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] - const nextVisible = c && c.powerZoneVisible === false - const radius = (c && c.powerZoneRadius != null) ? Number(c.powerZoneRadius) : 300 - const angle = (c && c.powerZoneAngle != null) ? Number(c.powerZoneAngle) : 120 - const color = (c && c.powerZoneColor) || 'rgba(255, 0, 0, 0.3)' - const opacity = (c && c.powerZoneOpacity != null) ? Number(c.powerZoneOpacity) : 0.3 - if (nextVisible) { - this.ensurePowerZoneForPlatformIcon(platformIconId, radius, angle, color, opacity) - this.$message.success('已显示威力区') - } else { - this.viewer.entities.removeById(`power-zone-platformIcon-${platformIconId}`) - this.$message.success('已隐藏威力区') - } - this.$set(this.platformIconZoneStyles, platformIconId, { ...this.platformIconZoneStyles[platformIconId], powerZoneVisible: nextVisible }) - const roomId = ed.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) - const platformId = ed.platformId - if (roomId && platformId) { - getPlatformStyle({ roomId, routeId: 0, platformId }).then(res => { - const existing = res.data || {} - savePlatformStyle({ ...existing, roomId: String(roomId), routeId: 0, platformId, powerZoneVisible: nextVisible }).then(() => this.$emit('platform-style-saved')).catch(() => {}) - }).catch(() => {}) - } + toggleAll('platformIcon') } }, @@ -9615,6 +10565,161 @@ export default { this.$emit('whiteboard-entity-deleted', entityData) if (entityData.entity) this.viewer.entities.remove(entityData.entity) if (this.whiteboardEntityDataMap && entityData.id) delete this.whiteboardEntityDataMap[entityData.id] + } else if (entityData.type === 'detectionZone' || entityData.type === 'powerZone') { + const type = entityData.type + const zoneId = entityData.zoneId + const routeId = entityData.routeId + const platformIconId = entityData.platformIconId + const roomId = entityData.roomId + const platformId = entityData.platformId + + if (!zoneId) { + this.contextMenu.visible = false + return + } + + // 1) 从 Cesium 移除该 zone 实体（按 zoneId 精确删除） + if (routeId != null) { + const id = type === 'detectionZone' ? `detection-zone-${routeId}-${zoneId}` : `power-zone-${routeId}-${zoneId}` + this.viewer.entities.removeById(id) + } else if (platformIconId) { + const id = type === 'detectionZone' + ? `detection-zone-platformIcon-${platformIconId}-${zoneId}` + : `power-zone-platformIcon-${platformIconId}-${zoneId}` + this.viewer.entities.removeById(id) + } + + // 2) 更新前端缓存（删除数组里的该 zone） + if (routeId != null) { + const c = this.platformCustomStyles && this.platformCustomStyles[routeId] ? this.platformCustomStyles[routeId] : {} + const normalized = this.normalizeZonesFromStyle(c) + const nextDetectionZones = (normalized.detectionZones || []).filter(z => z && z.zoneId !== zoneId) + const nextPowerZones = (normalized.powerZones || []).filter(z => z && z.zoneId !== zoneId) + + if (type === 'detectionZone') { + // 只删除 detectionZones + const fixedPowerZones = normalized.powerZones || [] + this.$set(this.platformCustomStyles, routeId, { + ...c, + detectionZones: nextDetectionZones, + powerZones: fixedPowerZones, + detectionZoneRadius: nextDetectionZones[0] ? nextDetectionZones[0].radiusKm : null, + detectionZoneColor: nextDetectionZones[0] ? nextDetectionZones[0].color : null, + detectionZoneOpacity: nextDetectionZones[0] ? nextDetectionZones[0].opacity : null, + detectionZoneVisible: nextDetectionZones[0] ? nextDetectionZones[0].visible !== false : false, + powerZoneRadius: fixedPowerZones[0] ? fixedPowerZones[0].radiusKm : null, + powerZoneAngle: fixedPowerZones[0] ? fixedPowerZones[0].angleDeg : null, + powerZoneColor: fixedPowerZones[0] ? fixedPowerZones[0].color : null, + powerZoneOpacity: fixedPowerZones[0] ? fixedPowerZones[0].opacity : null, + powerZoneVisible: fixedPowerZones[0] ? fixedPowerZones[0].visible !== false : false + }) + } else { + // 只删除 powerZones + const fixedDetectionZones = normalized.detectionZones || [] + this.$set(this.platformCustomStyles, routeId, { + ...c, + detectionZones: fixedDetectionZones, + powerZones: nextPowerZones, + detectionZoneRadius: fixedDetectionZones[0] ? fixedDetectionZones[0].radiusKm : null, + detectionZoneColor: fixedDetectionZones[0] ? fixedDetectionZones[0].color : null, + detectionZoneOpacity: fixedDetectionZones[0] ? fixedDetectionZones[0].opacity : null, + detectionZoneVisible: fixedDetectionZones[0] ? fixedDetectionZones[0].visible !== false : false, + powerZoneRadius: nextPowerZones[0] ? nextPowerZones[0].radiusKm : null, + powerZoneAngle: nextPowerZones[0] ? nextPowerZones[0].angleDeg : null, + powerZoneColor: nextPowerZones[0] ? nextPowerZones[0].color : null, + powerZoneOpacity: nextPowerZones[0] ? nextPowerZones[0].opacity : null, + powerZoneVisible: nextPowerZones[0] ? nextPowerZones[0].visible !== false : false + }) + } + } else if (platformIconId) { + const c = this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId] ? this.platformIconZoneStyles[platformIconId] : {} + const normalized = this.normalizeZonesFromStyle(c) + const nextDetectionZones = (normalized.detectionZones || []).filter(z => z && z.zoneId !== zoneId) + const nextPowerZones = (normalized.powerZones || []).filter(z => z && z.zoneId !== zoneId) + + if (type === 'detectionZone') { + const fixedPowerZones = normalized.powerZones || [] + this.$set(this.platformIconZoneStyles, platformIconId, { + ...c, + detectionZones: nextDetectionZones, + powerZones: fixedPowerZones, + detectionZoneRadius: nextDetectionZones[0] ? nextDetectionZones[0].radiusKm : null, + detectionZoneColor: nextDetectionZones[0] ? nextDetectionZones[0].color : null, + detectionZoneOpacity: nextDetectionZones[0] ? nextDetectionZones[0].opacity : null, + detectionZoneVisible: nextDetectionZones[0] ? nextDetectionZones[0].visible !== false : false, + powerZoneRadius: fixedPowerZones[0] ? fixedPowerZones[0].radiusKm : null, + powerZoneAngle: fixedPowerZones[0] ? fixedPowerZones[0].angleDeg : null, + powerZoneColor: fixedPowerZones[0] ? fixedPowerZones[0].color : null, + powerZoneOpacity: fixedPowerZones[0] ? fixedPowerZones[0].opacity : null, + powerZoneVisible: fixedPowerZones[0] ? fixedPowerZones[0].visible !== false : false + }) + } else { + const fixedDetectionZones = normalized.detectionZones || [] + this.$set(this.platformIconZoneStyles, platformIconId, { + ...c, + detectionZones: fixedDetectionZones, + powerZones: nextPowerZones, + detectionZoneRadius: fixedDetectionZones[0] ? fixedDetectionZones[0].radiusKm : null, + detectionZoneColor: fixedDetectionZones[0] ? fixedDetectionZones[0].color : null, + detectionZoneOpacity: fixedDetectionZones[0] ? fixedDetectionZones[0].opacity : null, + detectionZoneVisible: fixedDetectionZones[0] ? fixedDetectionZones[0].visible !== false : false, + powerZoneRadius: nextPowerZones[0] ? nextPowerZones[0].radiusKm : null, + powerZoneAngle: nextPowerZones[0] ? nextPowerZones[0].angleDeg : null, + powerZoneColor: nextPowerZones[0] ? nextPowerZones[0].color : null, + powerZoneOpacity: nextPowerZones[0] ? nextPowerZones[0].opacity : null, + powerZoneVisible: nextPowerZones[0] ? nextPowerZones[0].visible !== false : false + }) + } + } + + // 3) 同步到 Redis（删除后保存完整 zones 数组） + const apiRouteId = routeId != null ? routeId : 0 + const platformIconInstanceId = (apiRouteId === 0 && platformIconId && platformIconId.startsWith('platformIcon_room_')) ? platformIconId.split('_').pop() : null + if (roomId != null && (platformId != null || platformIconInstanceId != null)) { + const query = { roomId, routeId: apiRouteId, platformId: platformId || undefined, platformIconInstanceId: platformIconInstanceId || undefined } + getPlatformStyle(query).then(res => { + const existing = res.data || {} + const existingNormalized = this.normalizeZonesFromStyle(existing) + + // 从缓存拿删除后的 zones；兜底用现有 normalized + let nextDetectionZones = existingNormalized.detectionZones || [] + let nextPowerZones = existingNormalized.powerZones || [] + if (routeId != null && this.platformCustomStyles && this.platformCustomStyles[routeId]) { + const c = this.platformCustomStyles[routeId] + nextDetectionZones = Array.isArray(c.detectionZones) ? c.detectionZones : existingNormalized.detectionZones + nextPowerZones = Array.isArray(c.powerZones) ? c.powerZones : existingNormalized.powerZones + } + if (platformIconId && this.platformIconZoneStyles && this.platformIconZoneStyles[platformIconId]) { + const c = this.platformIconZoneStyles[platformIconId] + nextDetectionZones = Array.isArray(c.detectionZones) ? c.detectionZones : existingNormalized.detectionZones + nextPowerZones = Array.isArray(c.powerZones) ? c.powerZones : existingNormalized.powerZones + } + + const firstDetection = (nextDetectionZones || [])[0] || null + const firstPower = (nextPowerZones || [])[0] || null + + const styleData = { + ...existing, + roomId: String(roomId), + routeId: apiRouteId, + platformId: platformId || undefined, + platformIconInstanceId: platformIconInstanceId || undefined, + platformName: existing.platformName || undefined, + detectionZones: nextDetectionZones, + powerZones: nextPowerZones, + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : null, + detectionZoneColor: firstDetection ? firstDetection.color : null, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : null, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : false, + powerZoneRadius: firstPower ? firstPower.radiusKm : null, + powerZoneAngle: firstPower ? firstPower.angleDeg : null, + powerZoneColor: firstPower ? firstPower.color : null, + powerZoneOpacity: firstPower ? firstPower.opacity : null, + powerZoneVisible: firstPower ? firstPower.visible !== false : false + } + savePlatformStyle(styleData).then(() => this.$emit('platform-style-saved')).catch(() => {}) + }).catch(() => {}) + } } else if (entityData.id) { this.removeEntity(entityData.id) } else if (entityData.entity && entityData.entity.id) { @@ -9625,26 +10730,106 @@ export default { }, /** + * 生成探测区/威力区 zoneId：仅用数字/字母，避免出现在 id 解析时的歧义 + */ + generateZoneId() { + return `z_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}` + }, + + normalizeDetectionZonesFromStyle(style) { + const zones = [] + if (!style) return zones + if (Array.isArray(style.detectionZones) && style.detectionZones.length > 0) { + for (const z of style.detectionZones) { + if (!z) continue + zones.push({ + zoneId: z.zoneId || this.generateZoneId(), + radiusKm: z.radiusKm != null ? Number(z.radiusKm) : 50, + color: z.color || 'rgba(0, 150, 255, 0.35)', + opacity: z.opacity != null ? Number(z.opacity) : 0.35, + visible: z.visible !== false + }) + } + return zones + } + // 兼容旧数据：单探测区字段 + if (style.detectionZoneRadius != null) { + zones.push({ + zoneId: 'legacy-detection-1', + radiusKm: style.detectionZoneRadius != null ? Number(style.detectionZoneRadius) : 50, + color: style.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', + opacity: style.detectionZoneOpacity != null ? Number(style.detectionZoneOpacity) : 0.35, + visible: style.detectionZoneVisible !== false + }) + } + return zones + }, + + normalizePowerZonesFromStyle(style) { + const zones = [] + if (!style) return zones + if (Array.isArray(style.powerZones) && style.powerZones.length > 0) { + for (const z of style.powerZones) { + if (!z) continue + zones.push({ + zoneId: z.zoneId || this.generateZoneId(), + radiusKm: z.radiusKm != null ? Number(z.radiusKm) : 300, + angleDeg: z.angleDeg != null ? Number(z.angleDeg) : 120, + color: z.color || 'rgba(255, 0, 0, 0.3)', + opacity: z.opacity != null ? Number(z.opacity) : 0.3, + visible: z.visible !== false + }) + } + return zones + } + // 兼容旧数据：单威力区字段 + if (style.powerZoneRadius != null) { + zones.push({ + zoneId: 'legacy-power-1', + radiusKm: style.powerZoneRadius != null ? Number(style.powerZoneRadius) : 300, + angleDeg: style.powerZoneAngle != null ? Number(style.powerZoneAngle) : 120, + color: style.powerZoneColor || 'rgba(255, 0, 0, 0.3)', + opacity: style.powerZoneOpacity != null ? Number(style.powerZoneOpacity) : 0.3, + visible: style.powerZoneVisible !== false + }) + } + return zones + }, + + normalizeZonesFromStyle(style) { + return { + detectionZones: this.normalizeDetectionZonesFromStyle(style), + powerZones: this.normalizePowerZonesFromStyle(style) + } + }, + + /** * 由父组件在渲染航线前调用，预先写入平台样式，使 renderRouteWaypoints 创建实体时可直接用该颜色（无延迟） * @param {string} routeId - 航线 id * @param {Object} style - { labelFontSize, labelFontColor, platformSize, platformColor, detectionZoneRadius, detectionZoneColor, detectionZoneOpacity, powerZoneRadius, powerZoneAngle, powerZoneColor, powerZoneOpacity } */ setPlatformStyle(routeId, style) { if (!routeId || !style) return; + const normalized = this.normalizeZonesFromStyle(style) + const firstDetection = normalized.detectionZones && normalized.detectionZones.length > 0 ? normalized.detectionZones[0] : null + const firstPower = normalized.powerZones && normalized.powerZones.length > 0 ? normalized.powerZones[0] : null this.$set(this.platformCustomStyles, routeId, { labelFontSize: style.labelFontSize, labelFontColor: style.labelFontColor, platformSize: style.platformSize != null ? style.platformSize : 144, platformColor: style.platformColor != null ? style.platformColor : '#000000', - detectionZoneRadius: style.detectionZoneRadius, - detectionZoneColor: style.detectionZoneColor, - detectionZoneOpacity: style.detectionZoneOpacity, - detectionZoneVisible: style.detectionZoneVisible !== false, - powerZoneRadius: style.powerZoneRadius, - powerZoneAngle: style.powerZoneAngle, - powerZoneColor: style.powerZoneColor, - powerZoneOpacity: style.powerZoneOpacity, - powerZoneVisible: style.powerZoneVisible !== false + detectionZones: normalized.detectionZones, + powerZones: normalized.powerZones, + // 兼容旧逻辑：保留“单区字段”作为第一个 zone 的视图 + detectionZoneRadius: firstDetection ? firstDetection.radiusKm : style.detectionZoneRadius, + detectionZoneColor: firstDetection ? firstDetection.color : style.detectionZoneColor, + detectionZoneOpacity: firstDetection ? firstDetection.opacity : style.detectionZoneOpacity, + detectionZoneVisible: firstDetection ? firstDetection.visible !== false : (style.detectionZoneVisible !== false), + powerZoneRadius: firstPower ? firstPower.radiusKm : style.powerZoneRadius, + powerZoneAngle: firstPower ? firstPower.angleDeg : style.powerZoneAngle, + powerZoneColor: firstPower ? firstPower.color : style.powerZoneColor, + powerZoneOpacity: firstPower ? firstPower.opacity : style.powerZoneOpacity, + powerZoneVisible: firstPower ? firstPower.visible !== false : (style.powerZoneVisible !== false) }); }, @@ -9682,21 +10867,7 @@ export default { const style = res.data; // 缓存样式（含探测区、威力区及显示开关） - this.$set(this.platformCustomStyles, routeId, { - labelFontSize: style.labelFontSize, - labelFontColor: style.labelFontColor, - platformSize: style.platformSize, - platformColor: style.platformColor, - detectionZoneRadius: style.detectionZoneRadius, - detectionZoneColor: style.detectionZoneColor, - detectionZoneOpacity: style.detectionZoneOpacity, - detectionZoneVisible: style.detectionZoneVisible !== false, - powerZoneRadius: style.powerZoneRadius, - powerZoneAngle: style.powerZoneAngle, - powerZoneColor: style.powerZoneColor, - powerZoneOpacity: style.powerZoneOpacity, - powerZoneVisible: style.powerZoneVisible !== false - }); + this.setPlatformStyle(routeId, style) // 应用标牌样式 const labelEntity = this.viewer.entities.getById(`route-platform-label-${routeId}`); @@ -9724,14 +10895,27 @@ export default { entity.billboard.color = Cesium.Color.fromCssColorString(color); } - // 应用探测区（从 Redis 读出，仅当显示开关为 true 时绘制） - if (style.detectionZoneVisible !== false && style.detectionZoneRadius != null && style.detectionZoneRadius > 0) { - this.ensureDetectionZoneForRoute(routeId, style.detectionZoneRadius, style.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', style.detectionZoneOpacity); - } - // 应用威力区（从 Redis 读出） - if (style.powerZoneVisible !== false && style.powerZoneRadius != null && style.powerZoneRadius > 0) { - this.ensurePowerZoneForRoute(routeId, style.powerZoneRadius, style.powerZoneAngle ?? 120, style.powerZoneColor || 'rgba(255, 0, 0, 0.3)', style.powerZoneOpacity); - } + // 应用探测区/威力区（支持多个 zone） + const cachedStyle = this.platformCustomStyles && this.platformCustomStyles[routeId] + const detectionZones = (cachedStyle && cachedStyle.detectionZones) ? cachedStyle.detectionZones : this.normalizeDetectionZonesFromStyle(style) + const powerZones = (cachedStyle && cachedStyle.powerZones) ? cachedStyle.powerZones : this.normalizePowerZonesFromStyle(style) + + if (Array.isArray(detectionZones)) { + detectionZones.forEach(dz => { + if (!dz) return + if (dz.radiusKm == null || Number(dz.radiusKm) <= 0) return + const opacity = dz.visible === false ? 0 : dz.opacity + this.ensureDetectionZoneForRoute(routeId, dz.zoneId, dz.radiusKm, dz.color, opacity) + }) + } + if (Array.isArray(powerZones)) { + powerZones.forEach(pz => { + if (!pz) return + if (pz.radiusKm == null || Number(pz.radiusKm) <= 0) return + const opacity = pz.visible === false ? 0 : pz.opacity + this.ensurePowerZoneForRoute(routeId, pz.zoneId, pz.radiusKm, pz.angleDeg ?? 120, pz.color, opacity) + }) + } if (this.viewer.scene.requestRenderMode) { this.viewer.scene.requestRender(); @@ -9843,13 +11027,27 @@ export default { ) if (index > -1) { const entity = this.allEntities[index] - // 平台图标：移除伸缩框、探测区/威力区实体并清除选中；若已保存到服务端则通知父组件删除 + // 平台图标：移除伸缩框、探测区/威力区实体并清除选中；若已保存到服务端则通知父组件删除，并删除该实例的 Redis 样式避免幽灵区 if (entity.type === 'platformIcon') { - if (entity.serverId) this.$emit('platform-icon-removed', { serverId: entity.serverId }) + if (entity.serverId) { + this.$emit('platform-icon-removed', { serverId: entity.serverId }) + const roomId = entity.roomId || this.$route.query.roomId || (this.$parent && this.$parent.currentRoomId) + if (roomId) { + deletePlatformIconStyle(roomId, entity.serverId).catch(() => {}) + } + } this.removeTransformHandles(entity) if (this.selectedPlatformIcon === entity) this.selectedPlatformIcon = null - this.viewer.entities.removeById(`detection-zone-platformIcon-${entity.id}`) - this.viewer.entities.removeById(`power-zone-platformIcon-${entity.id}`) + const detectionPrefix = `detection-zone-platformIcon-${entity.id}-` + const powerPrefix = `power-zone-platformIcon-${entity.id}-` + const entities = this.viewer.entities.values + for (let i = entities.length - 1; i >= 0; i--) { + const e = entities[i] + const eid = typeof e.id === 'string' ? e.id : '' + if (eid.startsWith(detectionPrefix) || eid.startsWith(powerPrefix)) { + this.viewer.entities.remove(e) + } + } } // 从地图中移除 if (entity instanceof Cesium.Entity) { @@ -9894,8 +11092,16 @@ export default { this.removeTransformHandles(ed) if (this.selectedPlatformIcon === ed) this.selectedPlatformIcon = null if (ed.id) { - this.viewer.entities.removeById(`detection-zone-platformIcon-${ed.id}`) - this.viewer.entities.removeById(`power-zone-platformIcon-${ed.id}`) + const detectionPrefix = `detection-zone-platformIcon-${ed.id}-` + const powerPrefix = `power-zone-platformIcon-${ed.id}-` + const entities = this.viewer.entities.values + for (let i = entities.length - 1; i >= 0; i--) { + const e = entities[i] + const eid = typeof e.id === 'string' ? e.id : '' + if (eid.startsWith(detectionPrefix) || eid.startsWith(powerPrefix)) { + this.viewer.entities.remove(e) + } + } } if (ed.entity) this.viewer.entities.remove(ed.entity) this.allEntities = this.allEntities.filter(e => !(e.type === 'platformIcon' && e.serverId === serverId)) @@ -11781,8 +12987,6 @@ export default { this.isDrawing = false; this.viewer.canvas.style.cursor = 'default'; - this.$message.success(`威力区创建成功，半径：${radiusData.radius}${radiusData.unit}`); - this.powerZoneCenter = null; this.powerZoneCircleEntity = null; this.powerZoneCenterEntity = null; diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index 43b28c1..7c06b3a 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -2114,12 +2114,19 @@ export default { const styleRes = await getPlatformStyle({ roomId: rId, routeId, platformId: route.platformId }); if (styleRes.data && this.$refs.cesiumMap) { this.$refs.cesiumMap.setPlatformStyle(routeId, styleRes.data); - if (styleRes.data.detectionZoneVisible !== false && styleRes.data.detectionZoneRadius != null && Number(styleRes.data.detectionZoneRadius) > 0) { - this.$refs.cesiumMap.ensureDetectionZoneForRoute(routeId, styleRes.data.detectionZoneRadius, styleRes.data.detectionZoneColor || 'rgba(0, 150, 255, 0.35)', styleRes.data.detectionZoneOpacity); - } - if (styleRes.data.powerZoneVisible !== false && styleRes.data.powerZoneRadius != null && Number(styleRes.data.powerZoneRadius) > 0) { - this.$refs.cesiumMap.ensurePowerZoneForRoute(routeId, styleRes.data.powerZoneRadius, styleRes.data.powerZoneAngle ?? 120, styleRes.data.powerZoneColor || 'rgba(255, 0, 0, 0.3)', styleRes.data.powerZoneOpacity); - } + const normalized = this.$refs.cesiumMap.normalizeZonesFromStyle(styleRes.data); + (normalized.detectionZones || []).forEach(dz => { + if (!dz) return; + if (dz.radiusKm == null || Number(dz.radiusKm) <= 0) return; + const opacity = dz.visible === false ? 0 : dz.opacity; + this.$refs.cesiumMap.ensureDetectionZoneForRoute(routeId, dz.zoneId, dz.radiusKm, dz.color, opacity); + }); + (normalized.powerZones || []).forEach(pz => { + if (!pz) return; + if (pz.radiusKm == null || Number(pz.radiusKm) <= 0) return; + const opacity = pz.visible === false ? 0 : pz.opacity; + this.$refs.cesiumMap.ensurePowerZoneForRoute(routeId, pz.zoneId, pz.radiusKm, pz.angleDeg ?? 120, pz.color, opacity); + }); } } catch (_) {} } @@ -2470,6 +2477,26 @@ export default { }); this.routes = allRoutes; + + // 回滚/删除后后端可能不存在某些旧 routeId：右侧列表会消失，但地图实体如果不清理就会残留。 + // 这里先把 activeRouteIds 与后端现存 routes 做一致性校正，并同步移除地图上“已消失的航线实体”。 + const existingIdSet = new Set(allRoutes.map(r => String(r.id))); + const missingRouteIds = (this.activeRouteIds || []).filter(id => !existingIdSet.has(String(id))); + if (missingRouteIds.length > 0 && this.$refs.cesiumMap) { + missingRouteIds.forEach((routeId) => { + // removeRouteById 负责移除主航线/航点/盘旋与转弯半径弧等实体 + this.$refs.cesiumMap.removeRouteById(routeId); + // 同时清理探测区/威力区（removeRouteById 不覆盖这两类时显式保持一致） + this.$refs.cesiumMap.removeDetectionZoneByRouteId(routeId); + this.$refs.cesiumMap.removePowerZoneByRouteId(routeId); + }); + } + this.activeRouteIds = (this.activeRouteIds || []).filter(id => existingIdSet.has(String(id))); + // 如果当前选中航线也已回滚消失，则清空选中状态，避免右侧面板/地图再引用旧数据 + if (this.selectedRouteId != null && !existingIdSet.has(String(this.selectedRouteId))) { + this.selectedRouteId = null; + this.selectedRouteDetails = null; + } // 先预取所有展示中航线的平台样式，再渲染，避免平台图标先黑后变色（大房间时用方案所属子房间的 roomId） if (this.activeRouteIds.length > 0 && this.$refs.cesiumMap) { const roomId = this.currentRoomId; @@ -4010,7 +4037,7 @@ export default { map.setPlatformIconServerId(entityData.id, res.data.id, this.currentRoomId) entityData.serverId = res.data.id entityData.roomId = this.currentRoomId - this.$message.success('平台图标已保存到当前房间') + // 保存成功提示会遮挡地图，当前禁用该提示 this.wsConnection?.sendSyncPlatformIcons?.() } } catch (e) { @@ -5542,6 +5569,62 @@ export default { if (cache) { routeIdToTimeline[routeId] = cache; routeIdsWithTimeline.push(routeId); + + // 关键修复：缓存命中时也要生成“时间类冲突”，否则第二次点击会只剩空间类冲突导致空结果 + const { earlyArrivalLegs, lateArrivalLegs, holdDelayConflicts } = cache; + const routeName = route.name || `航线${route.id}`; + (earlyArrivalLegs || []).forEach(leg => { + const earlyMin = leg.earlyMinutes != null ? Math.round(leg.earlyMinutes * 10) / 10 : 0; + const earlyStr = earlyMin >= 0.1 ? `约 ${earlyMin} 分钟` : `约 ${Math.round(earlyMin * 60)} 秒`; + const speedStr = leg.suggestedSpeedKmh != null && Number.isFinite(leg.suggestedSpeedKmh) ? `约 ${leg.suggestedSpeedKmh} km/h` : '（按计划时间反算）'; + const kTimeStr = this.minutesToStartTime(leg.scheduled); + allRaw.push({ + type: CONFLICT_TYPE.TIME, + subType: 'early_arrival', + title: '提前到达', + routeName, + routeIds: [routeId], + fromWaypoint: leg.fromName, + toWaypoint: leg.toName, + time: this.minutesToStartTime(leg.actualArrival), + suggestion: `① 将本段速度降至 ${speedStr} ② 若下一航点为盘旋点，可盘旋等待 ${earlyStr} ③ 将下一航点相对K时调至 ${kTimeStr} 或更晚`, + severity: 'high' + }); + }); + (lateArrivalLegs || []).forEach(leg => { + const kTimeStr = leg.actualArrival != null && Number.isFinite(leg.actualArrival) ? this.minutesToStartTime(leg.actualArrival) : ''; + const part2 = kTimeStr ? ` ② 或将下一航点相对K时调至 ${kTimeStr} 或更晚` : ' ② 或将下一航点相对K时调晚'; + allRaw.push({ + type: CONFLICT_TYPE.TIME, + subType: 'late_arrival', + title: '无法按时到达', + routeName, + routeIds: [routeId], + fromWaypoint: leg.fromName, + toWaypoint: leg.toName, + suggestion: `① 将本段速度提升至 ≥${leg.requiredSpeedKmh} km/h${part2} ③ 调整上游航段速度或时间`, + severity: 'high' + }); + }); + (holdDelayConflicts || []).forEach(conf => { + allRaw.push({ + type: CONFLICT_TYPE.TIME, + subType: 'hold_delay', + title: '盘旋时间不足', + routeName, + routeIds: [routeId], + fromWaypoint: conf.fromName, + toWaypoint: conf.toName, + time: this.minutesToStartTime(conf.setExitTime), + position: conf.holdCenter ? `经度 ${conf.holdCenter.lng.toFixed(5)}°, 纬度 ${conf.holdCenter.lat.toFixed(5)}°` : undefined, + suggestion: `实际切出将延迟 ${conf.delaySeconds} 秒。① 延长该盘旋点相对K时 ② 定时盘旋调转弯半径，非定时调上一航点速度或本点相对K时 ③ 微调上下游航点相对K时`, + severity: 'high', + holdCenter: conf.holdCenter, + positionLng: conf.holdCenter && conf.holdCenter.lng, + positionLat: conf.holdCenter && conf.holdCenter.lat, + positionAlt: conf.holdCenter && conf.holdCenter.alt + }); + }); } else { let pathData = null; if (this.$refs.cesiumMap && this.$refs.cesiumMap.getRoutePathWithSegmentIndices) { @@ -5554,7 +5637,11 @@ export default { routeIdToTimeline[routeId] = { segments: timeline.segments, path: pathData && pathData.path ? pathData.path : null, - segmentEndIndices: pathData && pathData.segmentEndIndices ? pathData.segmentEndIndices : null + segmentEndIndices: pathData && pathData.segmentEndIndices ? pathData.segmentEndIndices : null, + // 缓存时间类冲突的中间结果，避免第二次点击时“只算空间不算时间” + earlyArrivalLegs: timeline.earlyArrivalLegs || [], + lateArrivalLegs: timeline.lateArrivalLegs || [], + holdDelayConflicts: timeline.holdDelayConflicts || [] }; this._setConflictTimelineCache(routeId, route.waypoints, minMinutes, maxMinutes, routeIdToTimeline[routeId]); routeIdsWithTimeline.push(routeId);