From 69fc7449941768ff82c5551a44493f186ef00d91 Mon Sep 17 00:00:00 2001 From: menghao <1584479611@qq.com> Date: Mon, 30 Mar 2026 10:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9D=90=E6=A0=87=E7=94=9F=E6=88=90=E7=A9=BA?= =?UTF-8?q?=E5=9F=9F=E3=80=81=E7=A9=BA=E5=9F=9F=E4=B8=8A=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 36 +- ruoyi-ui/src/lang/zh.js | 36 +- ruoyi-ui/src/views/cesiumMap/ContextMenu.vue | 34 +- ruoyi-ui/src/views/cesiumMap/index.vue | 92 ++++- ruoyi-ui/src/views/childRoom/TopHeader.vue | 5 + ruoyi-ui/src/views/childRoom/index.vue | 33 ++ .../src/views/dialogs/GenerateAirspaceDialog.vue | 402 +++++++++++++++++++++ 7 files changed, 618 insertions(+), 20 deletions(-) create mode 100644 ruoyi-ui/src/views/dialogs/GenerateAirspaceDialog.vue diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 30275b0..06051da 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -51,7 +51,8 @@ export default { }, airspace: { powerZone: 'Power Zone', - threatZone: 'Threat Zone' + threatZone: 'Threat Zone', + generateAirspace: 'Generate Airspace' }, options: { @@ -164,5 +165,38 @@ export default { pleaseInputMessage: 'Please enter message content', operationRollbackSuccess: 'Operation rollback successful', noLogs: 'No operation logs' + }, + generateAirspace: { + title: 'Generate Airspace', + shapeType: 'Shape', + polygon: 'Polygon', + rectangle: 'Rectangle', + circle: 'Circle', + sector: 'Sector', + name: 'Name', + namePlaceholder: 'Label on map (optional)', + color: 'Fill color', + borderWidth: 'Outline width', + vertices: 'Vertices', + polygonPlaceholder: 'At least 3 vertices, decimal degrees. One pair per line, or one line: (121.47,31.23), (120.15,30.28) separated by comma/semicolon', + rectangleSwCorner: 'SW corner (lon, lat)', + rectangleNeCorner: 'NE corner (lon, lat)', + cornerLonLatPlaceholder: '(longitude, latitude) e.g. (116.39, 39.90)', + centerLonLat: 'Center (lon, lat)', + radiusM: 'Radius', + radiusUnit: 'km', + startBearing: 'Start bearing (°)', + endBearing: 'End bearing (°)', + cancel: 'Cancel', + confirm: 'Create', + defaultLabel: 'Airspace', + errPolygonPoints: 'Polygon needs at least 3 valid lng,lat vertices', + errRectNumbers: 'Enter SW and NE corners as (longitude, latitude)', + errCircle: 'Enter center as (longitude, latitude) and radius in km', + errSector: 'Enter center as (longitude, latitude) and radius in km', + errBearing: 'Enter valid bearings', + needRoom: 'Enter a mission room first', + successMsg: 'Airspace created; it will be saved with the room', + errImport: 'Failed to create; check coordinates and parameters' } } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index b948664..e9fc6fc 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -51,7 +51,8 @@ export default { }, airspace: { powerZone: '威力区', - threatZone: '威胁区' + threatZone: '威胁区', + generateAirspace: '生成空域' }, options: { @@ -164,5 +165,38 @@ export default { pleaseInputMessage: '请输入消息内容', operationRollbackSuccess: '操作回滚成功', noLogs: '暂无操作日志' + }, + generateAirspace: { + title: '生成空域', + shapeType: '形状类型', + polygon: '多边形', + rectangle: '矩形', + circle: '圆形', + sector: '扇形', + name: '名称', + namePlaceholder: '地图上显示的名称（可选）', + color: '填充颜色', + borderWidth: '边线宽度', + vertices: '顶点坐标', + polygonPlaceholder: '至少 3 个顶点，十进制度。可每行一对「经度,纬度」；或一行写 (121.47,31.23)、(120.15,30.28) 用顿号分隔', + rectangleSwCorner: '西南角经纬度', + rectangleNeCorner: '东北角经纬度', + cornerLonLatPlaceholder: '（经度，纬度）例如 (116.39, 39.90)', + centerLonLat: '圆心经纬度', + radiusM: '半径', + radiusUnit: '千米', + startBearing: '起始方位角(°)', + endBearing: '终止方位角(°)', + cancel: '取消', + confirm: '生成', + defaultLabel: '空域', + errPolygonPoints: '多边形至少需要 3 个有效顶点（经度,纬度）', + errRectNumbers: '请按（经度，纬度）格式填写有效的西南角与东北角', + errCircle: '请按（经度，纬度）填写有效的圆心与半径（千米）', + errSector: '请按（经度，纬度）填写有效的圆心、半径（千米）', + errBearing: '请填写有效的方位角', + needRoom: '请先进入任务房间', + successMsg: '空域已生成，将随房间自动保存', + errImport: '生成失败，请检查坐标与参数' } } diff --git a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue index 9f2f7c2..a8bbd64 100644 --- a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue +++ b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue @@ -18,7 +18,7 @@ -
+
🗑️ 删除 @@ -156,6 +156,15 @@
+ +
+
空域
+
+ {{ isAirspaceLocked ? '🔓' : '🔒' }} + {{ isAirspaceLocked ? '解锁' : '上锁' }} +
+
+
飞机标牌
@@ -302,8 +311,8 @@
- -
+ +
位置
📍 @@ -312,7 +321,7 @@
-
+
命名
📝 @@ -322,7 +331,7 @@
-
+
填充属性
📝 @@ -739,6 +748,17 @@ export default { if (!this.entityData || this.entityData.routeId == null) return false return !!this.routeLocked[this.entityData.routeId] }, + isAirspaceShapeType() { + const t = this.entityData && this.entityData.type + return ['polygon', 'rectangle', 'circle', 'sector'].includes(t) + }, + isAirspaceLocked() { + return !!(this.entityData && this.entityData.locked) + }, + /** 已上锁的空域：隐藏顶层「删除」 */ + isLockedAirspaceDrawing() { + return this.isAirspaceShapeType && this.isAirspaceLocked + }, isHoldWaypoint() { const ed = this.entityData || {} if (!ed || ed.type !== 'routeWaypoint') return false @@ -766,6 +786,10 @@ export default { this.$emit('adjust-airspace-position') }, + handleToggleAirspaceLock() { + this.$emit('toggle-airspace-lock') + }, + handleEditAirspaceName() { const name = prompt('请输入图形名称：', this.entityData.name || '') if (name !== null) { diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index da8dae8..9516dd7 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -67,6 +67,7 @@ @edit-hold-speed="handleEditHoldSpeed" @launch-missile="openLaunchMissileDialog" @adjust-airspace-position="startAirspacePositionEdit" + @toggle-airspace-lock="toggleAirspaceLock" @apply-whiteboard-platform-style="applyWhiteboardPlatformStyleFromMenu" @close-menu="contextMenu.visible = false" @delete-box-selected-platforms="deleteBoxSelectedPlatformsFromMenu" @@ -9001,6 +9002,11 @@ export default { this.contextMenu.visible = false; return; } + if (this.isAirspaceDrawingLocked(entityData)) { + this.contextMenu.visible = false; + this.$message && this.$message.warning('该空域已上锁，无法调整位置'); + return; + } this.contextMenu.visible = false; entityData.entity.show = false; const center = this.getAirspaceCenter(entityData); @@ -9460,6 +9466,11 @@ export default { const ctx = this.airspacePositionEditContext; if (!ctx || !ctx.entityData) return; const entityData = ctx.entityData; + if (this.isAirspaceDrawingLocked(entityData)) { + this.clearAirspacePositionEdit(); + this.$message && this.$message.warning('该空域已上锁，无法调整位置'); + return; + } // 先移除预览实体，避免与真实实体同时显示导致“两个箭头”现象（尤其当箭头穿过矩形/圆形空域时） if (this.airspacePositionEditPreviewEntity) { this.viewer.entities.remove(this.airspacePositionEditPreviewEntity); @@ -9617,6 +9628,28 @@ export default { this.$emit('route-lock-changed', { routeId, locked: nextLocked }); }, + /** 右键空域：上锁/解锁；上锁后不可删除、不可改属性与调整位置 */ + toggleAirspaceLock() { + const ed = this.contextMenu.entityData + if (!ed || !['polygon', 'rectangle', 'circle', 'sector'].includes(ed.type)) { + this.contextMenu.visible = false + return + } + const entityData = this.allEntities.find(e => e.id === ed.id && e.type === ed.type) + if (!entityData) { + this.contextMenu.visible = false + return + } + const nextLocked = !entityData.locked + this.$set(entityData, 'locked', nextLocked) + if (this.contextMenu.entityData && this.contextMenu.entityData.id === entityData.id) { + this.$set(this.contextMenu.entityData, 'locked', nextLocked) + } + this.contextMenu.visible = false + this.$message && this.$message.success(nextLocked ? '空域已上锁，不可删除与修改' : '空域已解锁') + this.notifyDrawingEntitiesChanged() + }, + /** 右键飞机：切换该航线飞机标牌的显示/隐藏 */ toggleRouteLabelVisibility() { const ed = this.contextMenu.entityData @@ -11094,6 +11127,11 @@ export default { deleteEntityFromContextMenu() { if (this.contextMenu.entityData) { const entityData = this.contextMenu.entityData + if (this.isAirspaceDrawingLocked(entityData)) { + this.$message && this.$message.warning('该空域已上锁，无法删除') + this.contextMenu.visible = false + return + } if (entityData.type === 'platformBoxSelection') { this.contextMenu.visible = false return @@ -11464,6 +11502,11 @@ export default { updateEntityProperty(property, value) { if (this.contextMenu.entityData) { const entityData = this.contextMenu.entityData + if (this.isAirspaceDrawingLocked(entityData)) { + this.$message && this.$message.warning('该空域已上锁，无法修改') + this.contextMenu.visible = false + return + } // 更新实体数据 entityData[property] = value // 当修改填充色时，默认设置透明度为 20% @@ -11628,6 +11671,10 @@ export default { ) if (index > -1) { const entity = this.allEntities[index] + if (this.isAirspaceDrawingLocked(entity)) { + this.$message && this.$message.warning('该空域已上锁，无法删除') + return + } // 平台图标：移除伸缩框、探测区/威力区实体并清除选中；若已保存到服务端则通知父组件删除，并删除该实例的 Redis 样式避免幽灵区 if (entity.type === 'point' && entity.id) { this.ensureMapScreenDomLabelRegistry() @@ -11725,14 +11772,16 @@ export default { // 空域模式：只清除空域/威力区图形，不清除摆放的平台与航线 if (this.toolMode === 'airspace') { if (showConfirm) { - this.$confirm('是否清除所有空域图形？（平台与航线将保留）', '提示', { + this.$confirm('是否清除所有空域图形？（平台与航线将保留；已上锁空域将保留）', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { + const lockedN = (this.allEntities || []).filter(e => this.isAirspaceDrawingLocked(e)).length this.clearDrawingEntities(); this.notifyDrawingEntitiesChanged(); - this.$message({ type: 'success', message: '已清除空域图形' }); + const msg = lockedN > 0 ? `已清除未上锁图形（已保留 ${lockedN} 个已上锁空域）` : '已清除空域图形' + this.$message({ type: 'success', message: msg }); }).catch(() => {}); } else { this.clearDrawingEntities(); @@ -11868,6 +11917,13 @@ export default { getDrawingEntityTypes() { return ['line', 'polygon', 'rectangle', 'circle', 'sector', 'auxiliaryLine', 'arrow', 'text', 'image', 'powerZone'] }, + /** 多边形/矩形/圆/扇形空域是否已上锁 */ + isAirspaceDrawingLocked(entity) { + if (!entity) return false + const t = entity.type + if (!['polygon', 'rectangle', 'circle', 'sector'].includes(t)) return false + return !!entity.locked + }, /** 空域/威力区图形增删时通知父组件，用于自动保存到房间（从房间加载时不触发） */ notifyDrawingEntitiesChanged() { if (this.loadingDrawingsFromRoom) return @@ -11953,7 +12009,8 @@ export default { opacity: entity.opacity != null ? entity.opacity : 0, width: entity.width != null ? entity.width : 2, borderColor: entity.borderColor || entity.color, - name: entity.name || '' + name: entity.name || '', + locked: !!entity.locked }; break case 'rectangle': if (entity.points && entity.points.length >= 2) { @@ -11965,7 +12022,8 @@ export default { opacity: entity.opacity != null ? entity.opacity : 0, width: entity.width != null ? entity.width : 2, borderColor: entity.borderColor || entity.color, - name: entity.name || '' + name: entity.name || '', + locked: !!entity.locked } } else { data = { @@ -11974,7 +12032,8 @@ export default { opacity: entity.opacity != null ? entity.opacity : 0, width: entity.width != null ? entity.width : 2, borderColor: entity.borderColor || entity.color, - name: entity.name || '' + name: entity.name || '', + locked: !!entity.locked } } break @@ -11986,7 +12045,8 @@ export default { opacity: entity.opacity != null ? entity.opacity : 0, width: entity.width != null ? entity.width : 2, borderColor: entity.borderColor || entity.color, - name: entity.name || '' + name: entity.name || '', + locked: !!entity.locked }; break case 'ellipse': case 'hold_ellipse': @@ -12005,7 +12065,8 @@ export default { opacity: entity.opacity != null ? entity.opacity : 0, width: entity.width != null ? entity.width : 2, borderColor: entity.borderColor || entity.color, - name: entity.name || '' + name: entity.name || '', + locked: !!entity.locked }; break case 'auxiliaryLine': data = { @@ -12096,7 +12157,7 @@ export default { clearDrawingEntities() { if (!this.allEntities || !this.viewer) return const types = this.getDrawingEntityTypes() - const toRemove = this.allEntities.filter(item => types.includes(item.type)) + const toRemove = this.allEntities.filter(item => types.includes(item.type) && !this.isAirspaceDrawingLocked(item)) toRemove.forEach(item => { try { if (item.type === 'text' && item.entity && item.entity.id) { @@ -12119,7 +12180,7 @@ export default { } } catch (e) { console.warn('clearDrawingEntities:', e) } }) - this.allEntities = this.allEntities.filter(item => !types.includes(item.type)) + this.allEntities = this.allEntities.filter(item => !types.includes(item.type) || this.isAirspaceDrawingLocked(item)) }, /** 从屏幕坐标获取经纬度（用于白板拖放等） */ getLatLngFromScreen(clientX, clientY) { @@ -12783,7 +12844,8 @@ export default { opacity: polyOpacity, width: polyWidth, label: entityData.label || '面', - name: entityData.data.name || '' + name: entityData.data.name || '', + locked: entityData.data.locked === true } this.allEntities.push(polyEntityData) if (polyEntityData.name) this.updateAirspaceEntityLabel(polyEntityData) @@ -12830,10 +12892,12 @@ export default { opacity: rectOpacity, width: rectWidth, label: entityData.label || '矩形', - name: entityData.data.name || '' + name: entityData.data.name || '', + locked: entityData.data.locked === true } this.allEntities.push(rectEntityData) if (rectEntityData.name) this.updateAirspaceEntityLabel(rectEntityData) + this.notifyDrawingEntitiesChanged() return } case 'circle': { @@ -12874,7 +12938,8 @@ export default { opacity: circleOpacity, width: circleWidth, label: entityData.label || '圆形', - name: entityData.data.name || '' + name: entityData.data.name || '', + locked: entityData.data.locked === true } this.allEntities.push(circleEntityData) if (circleEntityData.name) this.updateAirspaceEntityLabel(circleEntityData) @@ -12981,7 +13046,8 @@ export default { opacity: sectorOpacity, width: sectorWidth, label: entityData.label || '扇形', - name: entityData.data.name || '' + name: entityData.data.name || '', + locked: d.locked === true } this.allEntities.push(sectorEntityData) if (sectorEntityData.name) this.updateAirspaceEntityLabel(sectorEntityData) diff --git a/ruoyi-ui/src/views/childRoom/TopHeader.vue b/ruoyi-ui/src/views/childRoom/TopHeader.vue index 2c85b85..1b9373d 100644 --- a/ruoyi-ui/src/views/childRoom/TopHeader.vue +++ b/ruoyi-ui/src/views/childRoom/TopHeader.vue @@ -152,6 +152,7 @@ {{ $t('topHeader.airspace.powerZone') }} {{ $t('topHeader.airspace.threatZone') }} + {{ $t('topHeader.airspace.generateAirspace') }} @@ -596,6 +597,10 @@ export default { this.$emit('threat-zone') }, + generateAirspace() { + this.$emit('generate-airspace') + }, + // 工具下拉菜单方法 routeCalculation() { this.$emit('route-calculation') diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index 7bfe2ca..6fb29fa 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -147,6 +147,7 @@ @load-aero-chart="loadAeroChart" @start-power-zone-drawing="startPowerZoneDrawing" @threat-zone="threatZone" + @generate-airspace="openGenerateAirspaceDialog" @route-calculation="routeCalculation" @conflict-display="conflictDisplay" @data-materials="dataMaterials" @@ -389,6 +390,12 @@ @save="savePageLayout" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('generateAirspace.cancel') }} + {{ $t('generateAirspace.confirm') }} + + + + + + +