From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue | 327 +++++++++++++++++++++++++----------------------------
1 files changed, 155 insertions(+), 172 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index 8e3c493..8d026e2 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -1,86 +1,101 @@
<template>
- <el-dialog
- v-model="visible"
- :title="dialogTitle"
- class="detection-range-dialog"
- destroy-on-close
- @closed="handleClosed"
- >
- <div class="dialog-body">
- <div class="dialog-map">
- <DeviceMapContainer
- :online-devices="mapDevices"
- :show-layer-control="false"
- container-id="detection-range-map"
- />
- <div class="map-toolbar">
- <button class="map-btn" type="button" aria-label="编辑范围"></button>
- <button class="map-btn" type="button" aria-label="定位设备"></button>
- </div>
- <div class="map-mini-controls">
- <button class="map-mini-btn" type="button" aria-label="放大">+</button>
- <button class="map-mini-btn" type="button" aria-label="缩小">-</button>
- </div>
+ <el-dialog v-model="visible" class="ztzf-page-map-view-dialog" :show-close="false" :close-on-click-modal="false"
+ destroy-on-close @closed="handleClosed">
+ <div class="dialog-container">
+ <div class="left-container">
+ <div class="leftMap ztzf-cesium" id="detectionRangeMap"></div>
</div>
- <div class="dialog-form">
- <div class="form-title">{{ formTitle }}</div>
- <el-form ref="formRef" :model="formData" :rules="rules" label-width="84px" :disabled="dialogReadonly">
+
+ <div class="right-container">
+ <div class="header">{{ formTitle }}</div>
+
+ <div class="dialog-container" v-if="dialogReadonly">
+ <el-row>
+ <el-col :span="24">
+ <div class="label">侦测设备</div>
+ <div class="val">{{ formData.deviceName || '-' }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">设备类型</div>
+ <div class="val">{{ getDeviceTypeLabel(formData.deviceType) }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">设备位置</div>
+ <div class="val">{{ formData.deployLocation || '-' }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">设备编号</div>
+ <div class="val">{{ formData.deviceSn || '-' }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">设备型号</div>
+ <div class="val">{{ formData.deviceModel || '-' }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">覆盖范围</div>
+ <div class="val">{{ formatRange(formData.effectiveRangeKm) }}</div>
+ </el-col>
+ </el-row>
+ </div>
+
+ <el-form v-else ref="formRef" class="dialog-form" :model="formData" :rules="rules" label-width="96px">
<el-form-item label="侦测设备" prop="deviceId">
- <el-select v-model="formData.deviceId" placeholder="请选择" clearable @change="handleDeviceChange">
- <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value" />
+ <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+ v-model="formData.deviceId" placeholder="请选择" clearable @change="handleDeviceChange">
+ <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label"
+ :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
- <el-select v-model="formData.deviceType" placeholder="请选择" clearable>
- <el-option
- v-for="item in dictObj.deviceType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+ v-model="formData.deviceType" placeholder="请选择" clearable>
+ <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="设备位置" prop="deployLocation">
- <el-input v-model="formData.deployLocation" placeholder="请选择位置">
+ <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deployLocation"
+ placeholder="请选择位置">
<template #suffix>
<span class="suffix-action">地图选点</span>
</template>
</el-input>
</el-form-item>
<el-form-item label="设备编号" prop="deviceSn">
- <el-input v-model="formData.deviceSn" placeholder="请输入" clearable />
+ <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deviceSn" placeholder="请输入"
+ clearable />
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
- <el-input v-model="formData.deviceModel" placeholder="请输入" clearable />
+ <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deviceModel"
+ placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="覆盖范围" prop="effectiveRangeKm">
- <el-input-number
- v-model="formData.effectiveRangeKm"
- :min="0"
- :precision="2"
- :controls="false"
- placeholder="请输入"
- />
+ <el-input-number class="ztzf-data-cockpit-search-input" v-model="formData.effectiveRangeKm" :min="0" :precision="2" :controls="false"
+ placeholder="请输入" />
</el-form-item>
</el-form>
+ <div class="footer">
+ <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+ <el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting"
+ :disabled="submitting" @click="handleSubmit">
+ 保存
+ </el-button>
+ </div>
</div>
</div>
- <template v-if="!dialogReadonly" #footer>
- <el-button @click="handleCancel">取消</el-button>
- <el-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">保存</el-button>
- </template>
</el-dialog>
</template>
<script setup>
-import { computed, inject, ref } from 'vue'
+import { computed, inject, nextTick, ref } from 'vue'
import { ElMessage } from 'element-plus'
-import DeviceMapContainer from '@/components/map-container/device-map-container.vue'
import {
detectionRangeDetailApi,
detectionRangePageApi,
detectionRangeSubmitApi,
} from '@/api/detectionCountermeasure/detectionRange'
+import { PublicCesium } from '@/utils/cesium/publicCesium'
+import * as Cesium from 'cesium'
const initForm = () => ({
deviceId: '', // 侦测设备ID
@@ -99,17 +114,10 @@
const visible = ref(false) // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
-const mapDevices = ref([])
const deviceOptions = ref([])
const dialogReadonly = computed(() => dialogMode.value === 'view')
-const dialogTitle = computed(() => {
- if (dialogMode.value === 'edit') {
- return '编辑'
- } else if (dialogMode.value === 'view') {
- return '查看'
- }
- return '新增'
-})
+let viewer
+let redPointEntity
const formTitle = computed(() => {
if (dialogMode.value === 'edit') {
return '编辑侦测范围'
@@ -123,10 +131,11 @@
const rules = {
deviceId: [{ required: true, message: '请选择侦测设备', trigger: ['blur', 'change'] }],
deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
+ deployLocation: [{ required: true, message: '请选择设备位置', trigger: ['blur', 'change'] }],
effectiveRangeKm: [{ required: true, message: '请输入覆盖范围', trigger: ['blur', 'change'] }],
}
-function handleDeviceChange(value) {
+function handleDeviceChange (value) {
const target = deviceOptions.value.find(item => item.value === value)
const raw = target?.raw
if (!raw) return
@@ -139,13 +148,24 @@
raw.deployLocation ?? raw.address ?? raw.location ?? raw.deployAddress ?? formData.value.deployLocation
}
+function getDeviceTypeLabel (value) {
+ const list = dictObj?.deviceType ?? []
+ const target = list.find(item => item.dictKey === value)
+ return target?.dictValue ?? value ?? '-'
+}
+
+function formatRange (value) {
+ if (value == null || value === '') return '-'
+ return `${value}km`
+}
+
// 关闭弹框
-function handleCancel() {
+function handleCancel () {
visible.value = false
}
// 提交新增/编辑
-async function handleSubmit() {
+async function handleSubmit () {
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
submitting.value = true
@@ -166,13 +186,13 @@
}
// 加载详情
-async function loadDetail(id) {
+async function loadDetail (id) {
if (!id) return null
const res = await detectionRangeDetailApi({ id })
return res?.data?.data ?? null
}
-async function loadDeviceOptions() {
+async function loadDeviceOptions () {
const res = await detectionRangePageApi({
current: 1,
size: 200,
@@ -187,14 +207,75 @@
}
// 关闭后重置
-function handleClosed() {
+function handleClosed () {
formData.value = initForm()
+ viewer = null
+ redPointEntity = null
+}
+
+function setMapPoint (longitude, latitude) {
+ if (!viewer || longitude == null || latitude == null) return
+ if (!redPointEntity) {
+ redPointEntity = viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
+ point: {
+ color: Cesium.Color.RED,
+ pixelSize: 10,
+ },
+ label: {
+ text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
+ font: '14px',
+ 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,
+ eyeOffset: new Cesium.Cartesian3(0, 0, -20),
+ },
+ })
+ } else {
+ redPointEntity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
+ redPointEntity.label.text = `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`
+ }
+}
+
+function initMap () {
+ if (viewer) return
+ const publicCesiumInstance = new PublicCesium({
+ dom: 'detectionRangeMap',
+ flatMode: false,
+ terrain: true,
+ layerMode: 4,
+ boundary: false,
+ })
+ if (!dialogReadonly.value) {
+ publicCesiumInstance.addLeftClickEvent(null, handleMapClick)
+ }
+ viewer = publicCesiumInstance.getViewer()
+}
+
+function handleMapClick (click) {
+ const pos = click.position
+ const cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
+ if (!cartesian3) return
+ const carto = Cesium.Cartographic.fromCartesian(cartesian3)
+ const longitude = Number(Cesium.Math.toDegrees(carto.longitude).toFixed(6))
+ const latitude = Number(Cesium.Math.toDegrees(carto.latitude).toFixed(6))
+ formData.value.deployLocation = `${longitude}, ${latitude}`
+ setMapPoint(longitude, latitude)
}
// 打开弹框
-async function open({ mode, row } = {}) {
+async function open ({ mode, row } = {}) {
dialogMode.value = mode || 'add'
visible.value = true
+ await nextTick()
+ initMap()
if (dialogMode.value === 'add') {
await loadDeviceOptions()
formData.value = initForm()
@@ -212,114 +293,16 @@
if (currentId && !deviceOptions.value.some(item => item.value === currentId)) {
deviceOptions.value.unshift({ label: currentName || '-', value: currentId })
}
+ 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)
+ }
+ }
}
defineExpose({ open })
</script>
-<style scoped lang="scss">
-.detection-range-dialog {
- :deep(.el-dialog) {
- width: 1100px;
- background: #071833;
- border-radius: 8px;
- }
-
- :deep(.el-dialog__header) {
- border-bottom: 1px solid rgba(70, 110, 180, 0.35);
- }
-}
-
-.dialog-body {
- display: flex;
- gap: 16px;
- min-height: 560px;
-}
-
-.dialog-map {
- position: relative;
- flex: 1;
- min-height: 520px;
- border-radius: 8px;
- overflow: hidden;
- border: 1px solid rgba(70, 110, 180, 0.35);
- background: #031024;
-}
-
-.map-toolbar {
- position: absolute;
- top: 16px;
- right: 16px;
- display: flex;
- flex-direction: column;
- gap: 8px;
- z-index: 2;
-}
-
-.map-btn {
- width: 34px;
- height: 34px;
- border-radius: 6px;
- border: 1px solid rgba(80, 120, 180, 0.6);
- background: rgba(7, 18, 44, 0.9);
- cursor: pointer;
-}
-
-.map-mini-controls {
- position: absolute;
- left: 16px;
- bottom: 16px;
- display: flex;
- flex-direction: column;
- gap: 6px;
- z-index: 2;
-}
-
-.map-mini-btn {
- width: 28px;
- height: 28px;
- border-radius: 4px;
- border: 1px solid rgba(80, 120, 180, 0.6);
- background: rgba(7, 18, 44, 0.9);
- color: #cfe3ff;
- cursor: pointer;
-}
-
-.dialog-form {
- width: 300px;
- padding: 12px 12px 0;
- border-radius: 8px;
- background: linear-gradient(180deg, rgba(10, 28, 58, 0.95), rgba(6, 16, 34, 0.95));
- border: 1px solid rgba(70, 110, 180, 0.35);
- color: #d7e7ff;
-}
-
-.form-title {
- font-size: 14px;
- font-weight: 600;
- margin-bottom: 12px;
- letter-spacing: 1px;
-}
-
-:deep(.el-form-item__label) {
- color: rgba(210, 230, 255, 0.85);
-}
-
-:deep(.el-input__wrapper),
-:deep(.el-select__wrapper),
-:deep(.el-input-number .el-input__wrapper) {
- background: rgba(7, 20, 44, 0.85);
- border: 1px solid rgba(80, 120, 190, 0.45);
- box-shadow: none;
-}
-
-:deep(.el-input__inner) {
- color: #d5e6ff;
-}
-
-.suffix-action {
- font-size: 12px;
- color: #7fb6ff;
- cursor: pointer;
-}
-</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3