From 7589cd256fb347f7ff6c86da5dd90ae2dfa4e071 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 26 Jan 2026 17:42:16 +0800
Subject: [PATCH] feat:数据驾驶舱

---
 applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index 457bf65..ca54c44 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -21,9 +21,13 @@
 			</div>
 
 			<div class="right-container">
-				<div class="header">{{ formTitle }}</div>
+				<div class="header">
+					<span>{{ formTitle }}</span>
+				
+					<el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
+				</div>
 
-				<div class="dialog-container" v-if="dialogReadonly">
+				<div class="content" v-if="dialogReadonly">
 					<el-row>
 						<el-col :span="24">
 							<div class="label">侦测设备</div>
@@ -31,7 +35,7 @@
 						</el-col>
 						<el-col :span="24">
 							<div class="label">设备类型</div>
-							<div class="val">{{ getDeviceTypeLabel(formData.deviceType) }}</div>
+							<div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
 						</el-col>
 						<el-col :span="24">
 							<div class="label">设备位置</div>
@@ -59,6 +63,7 @@
 							popper-class="command-select-popper"
 							v-model="formData.deviceId"
 							placeholder="请选择"
+							:disabled="dialogMode === 'edit'"
 							clearable
 							@change="handleDeviceChange"
 						>
@@ -70,6 +75,7 @@
 							class="command-select"
 							popper-class="command-select-popper"
 							v-model="formData.deviceType"
+							disabled
 							placeholder="请选择"
 							clearable
 						>
@@ -97,6 +103,7 @@
 						<el-input
 							class="command-input"
 							v-model="formData.deviceSn"
+							disabled
 							placeholder="请输入"
 							clearable
 						/>
@@ -105,6 +112,7 @@
 						<el-input
 							class="command-input"
 							v-model="formData.deviceModel"
+							disabled
 							placeholder="请输入"
 							clearable
 						/>
@@ -114,14 +122,14 @@
 							class="command-input"
 							v-model="formData.effectiveRangeKm"
 							:min="0"
-							:precision="2"
+							:precision="0"
 							:controls="false"
 							placeholder="请输入"
 						/>
 					</el-form-item>
 				</el-form>
 				<div class="footer">
-					<el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+					<el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
 					<el-button
 						color="#284FE3"
 						v-if="!dialogReadonly"
@@ -139,6 +147,10 @@
 </template>
 
 <script setup>
+import { getDictLabel } from '@ztzf/utils'
+
+import { Close } from '@element-plus/icons-vue'
+
 import { computed, inject, nextTick, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import {
@@ -148,8 +160,10 @@
 } from '@/api/detectionCountermeasure/detectionRange'
 import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
 import * as Cesium from 'cesium'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 
-import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'
+import equipment from '@/assets/images/dataCockpit/legend/equipment.png'
 
 const initForm = () => ({
 	deviceId: '', // 侦测设备ID
@@ -171,6 +185,7 @@
 const deviceOptions = ref([])
 const dialogReadonly = computed(() => dialogMode.value === 'view')
 const mapRef = ref(null)
+const route = useRoute()
 let viewer
 let redPointEntity
 let rangeCircleEntity
@@ -226,13 +241,25 @@
 	if (!isValid) return
 	submitting.value = true
 	try {
+		const {longitude, latitude} = parseDeployLocation(formData.value.deployLocation)
+
 		const payload = {
-			...formData.value,
 			id: formData.value.id || formData.value.deviceId || undefined,
 			effectiveRangeKmIsNotNull: formData.value.effectiveRangeKm ? 1 : 2,
+			effectiveRangeKm: formData.value.effectiveRangeKm,
+			longitude,
+			latitude
 		}
 		delete payload.deviceId
 		await detectionRangeSubmitApi(payload)
+
+		const actionText = dialogMode.value === 'add' ? '新增' : '修改'
+		saveOperationLog({
+			requestUri: route.path,
+			title: `${route.name || '侦测范围管理'}-${actionText}`,
+			type: 1
+		})
+
 		ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
 		visible.value = false
 		emit('success')
@@ -277,7 +304,7 @@
 		redPointEntity = viewer.entities.add({
 			position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
 			billboard: {
-				image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
+				image: equipment, // 这里替换为你的图片路径或变量 deviceZcImg
 				width: 40,
 				height: 56,
 				verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
@@ -286,7 +313,7 @@
 				text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
 				font: '16px',
 				fillColor: Cesium.Color.WHITE,
-				backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
+				backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
 				backgroundPadding: new Cesium.Cartesian2(5, 5),
 				showBackground: true,
 				style: Cesium.LabelStyle.FILL_AND_OUTLINE,

--
Gitblit v1.9.3