From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index c5e34bd..6a2eb39 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>
@@ -70,6 +74,7 @@
class="command-select"
popper-class="command-select-popper"
v-model="formData.deviceType"
+ disabled
placeholder="请选择"
clearable
>
@@ -83,7 +88,7 @@
</el-form-item>
<el-form-item label="设备位置" prop="deployLocation">
<el-input
- class="command-search-input"
+ class="command-input"
v-model="formData.deployLocation"
disabled
placeholder="请选择位置"
@@ -95,23 +100,25 @@
</el-form-item>
<el-form-item label="设备编号" prop="deviceSn">
<el-input
- class="command-search-input"
+ class="command-input"
v-model="formData.deviceSn"
+ disabled
placeholder="请输入"
clearable
/>
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
<el-input
- class="command-search-input"
+ class="command-input"
v-model="formData.deviceModel"
+ disabled
placeholder="请输入"
clearable
/>
</el-form-item>
<el-form-item label="覆盖范围(m)" prop="effectiveRangeKm">
<el-input-number
- class="command-search-input"
+ class="command-input"
v-model="formData.effectiveRangeKm"
:min="0"
:precision="2"
@@ -139,6 +146,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import {
--
Gitblit v1.9.3