Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

 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
                  >
@@ -97,6 +102,7 @@
                  <el-input
                     class="command-input"
                     v-model="formData.deviceSn"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
@@ -105,6 +111,7 @@
                  <el-input
                     class="command-input"
                     v-model="formData.deviceModel"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
@@ -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 {