From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index 51e7333..e3caeb2 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="visible"
- class="ztzf-page-map-view-dialog"
+ class="command-page-map-view-dialog"
:show-close="false"
:close-on-click-modal="false"
destroy-on-close
@@ -9,7 +9,7 @@
>
<div class="dialog-container">
<div class="left-container">
- <div class="leftMap ztzf-cesium" id="detectionRangeMap"></div>
+ <div class="leftMap command-cesium" id="detectionRangeMap"></div>
</div>
<div class="right-container">
@@ -47,8 +47,8 @@
<el-form v-else ref="formRef" class="dialog-form" :model="formData" :rules="rules" label-width="110px">
<el-form-item label="侦测设备" prop="deviceId">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.deviceId"
placeholder="请选择"
clearable
@@ -59,8 +59,8 @@
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.deviceType"
placeholder="请选择"
clearable
@@ -75,7 +75,7 @@
</el-form-item>
<el-form-item label="设备位置" prop="deployLocation">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.deployLocation"
disabled
placeholder="请选择位置"
@@ -87,7 +87,7 @@
</el-form-item>
<el-form-item label="设备编号" prop="deviceSn">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.deviceSn"
placeholder="请输入"
clearable
@@ -95,7 +95,7 @@
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.deviceModel"
placeholder="请输入"
clearable
@@ -103,7 +103,7 @@
</el-form-item>
<el-form-item label="覆盖范围(m)" prop="effectiveRangeKm">
<el-input-number
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.effectiveRangeKm"
:min="0"
:precision="2"
@@ -131,7 +131,7 @@
</template>
<script setup>
-import { computed, inject, nextTick, ref } from 'vue'
+import { computed, inject, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import {
detectionRangeDetailApi,
@@ -140,6 +140,7 @@
} from '@/api/detectionCountermeasure/detectionRange'
import { PublicCesium } from '@/utils/cesium/publicCesium'
import * as Cesium from 'cesium'
+import deviceZcImg from '@/assets/images/dataCockpit/device-zc.svg'
const initForm = () => ({
deviceId: '', // 侦测设备ID
@@ -162,6 +163,7 @@
const dialogReadonly = computed(() => dialogMode.value === 'view')
let viewer
let redPointEntity
+let rangeCircleEntity
const formTitle = computed(() => {
if (dialogMode.value === 'edit') {
return '编辑侦测范围'
@@ -253,8 +255,10 @@
// 关闭后重置
function handleClosed() {
formData.value = initForm()
+ clearRangeCircle()
viewer = null
redPointEntity = null
+ rangeCircleEntity = null
}
function setMapPoint(longitude, latitude) {
@@ -262,9 +266,11 @@
if (!redPointEntity) {
redPointEntity = viewer.entities.add({
position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
- point: {
- color: Cesium.Color.RED,
- pixelSize: 10,
+ billboard: {
+ image: deviceZcImg, // 这里替换为你的图片路径或变量 deviceZcImg
+ width: 30, // 可选：设置图片宽度
+ height: 42, // 可选：设置图片高度
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
},
label: {
text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
@@ -272,13 +278,13 @@
fillColor: Cesium.Color.WHITE,
backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
backgroundPadding: new Cesium.Cartesian2(5, 5),
- pixelOffset: new Cesium.Cartesian2(0, -20),
showBackground: true,
style: Cesium.LabelStyle.FILL_AND_OUTLINE,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.CENTER,
outlineWidth: 1,
outlineColor: Cesium.Color.WHITE,
+ pixelOffset: new Cesium.Cartesian2(0, -60),
eyeOffset: new Cesium.Cartesian3(0, 0, -20),
},
})
@@ -286,6 +292,48 @@
redPointEntity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
redPointEntity.label.text = `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`
}
+ updateRangeCircle(longitude, latitude, formData.value.effectiveRangeKm)
+}
+
+function parseDeployLocation(value) {
+ if (!value) return null
+ const [longitude, latitude] = value.split(',').map(item => Number(item.trim()))
+ if (Number.isNaN(longitude) || Number.isNaN(latitude)) return null
+ return { longitude, latitude }
+}
+
+function clearRangeCircle() {
+ if (viewer && rangeCircleEntity) {
+ viewer.entities.remove(rangeCircleEntity)
+ }
+}
+
+function updateRangeCircle(longitude, latitude, range) {
+ if (!viewer || longitude == null || latitude == null) return
+ const rangeMeters = Number(range)
+ if (!Number.isFinite(rangeMeters) || rangeMeters <= 0) {
+ clearRangeCircle()
+ rangeCircleEntity = null
+ return
+ }
+ const position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
+ if (!rangeCircleEntity) {
+ rangeCircleEntity = viewer.entities.add({
+ position,
+ ellipse: {
+ semiMajorAxis: rangeMeters,
+ semiMinorAxis: rangeMeters,
+ material: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ },
+ })
+ return
+ }
+ rangeCircleEntity.position = position
+ rangeCircleEntity.ellipse.semiMajorAxis = rangeMeters
+ rangeCircleEntity.ellipse.semiMinorAxis = rangeMeters
}
function initMap() {
@@ -339,15 +387,24 @@
}
const location = formData.value.deployLocation
if (location) {
- const [longitude, latitude] = location.split(',').map(item => Number(item.trim()))
- if (!Number.isNaN(longitude) && !Number.isNaN(latitude)) {
- setMapPoint(longitude, latitude)
+ const parsed = parseDeployLocation(location)
+ if (parsed) {
+ setMapPoint(parsed.longitude, parsed.latitude)
viewer.flyTo(redPointEntity, { duration: 0 })
}
}
}
defineExpose({ open })
+
+watch(
+ () => formData.value.effectiveRangeKm,
+ value => {
+ const parsed = parseDeployLocation(formData.value.deployLocation)
+ if (!parsed) return
+ updateRangeCircle(parsed.longitude, parsed.latitude, value)
+ }
+)
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3