From 7040e9649e51857e49261fb29f2a3a3bbf9f55e8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jan 2026 16:24:03 +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 | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index 071ad9f..8e3c493 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -24,21 +24,10 @@
</div>
<div class="dialog-form">
<div class="form-title">{{ formTitle }}</div>
- <el-form
- ref="formRef"
- :model="formData"
- :rules="rules"
- label-width="84px"
- :disabled="dialogReadonly"
- >
+ <el-form ref="formRef" :model="formData" :rules="rules" label-width="84px" :disabled="dialogReadonly">
<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-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">
@@ -58,8 +47,8 @@
</template>
</el-input>
</el-form-item>
- <el-form-item label="设备编号" prop="deviceCode">
- <el-input v-model="formData.deviceCode" placeholder="请输入" clearable />
+ <el-form-item label="设备编号" prop="deviceSn">
+ <el-input v-model="formData.deviceSn" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="formData.deviceModel" placeholder="请输入" clearable />
@@ -78,14 +67,7 @@
</div>
<template v-if="!dialogReadonly" #footer>
<el-button @click="handleCancel">取消</el-button>
- <el-button
- type="primary"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
- >
- 保存
- </el-button>
+ <el-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">保存</el-button>
</template>
</el-dialog>
</template>
@@ -105,7 +87,7 @@
deviceName: '', // 侦测设备
deviceType: '', // 设备类型
deployLocation: '', // 设备位置
- deviceCode: '', // 设备编号
+ deviceSn: '', // 设备编号
deviceModel: '', // 设备型号
effectiveRangeKm: null, // 覆盖范围
})
@@ -152,14 +134,9 @@
formData.value.deviceName = raw.deviceName ?? formData.value.deviceName
formData.value.deviceType = raw.deviceType ?? formData.value.deviceType
formData.value.deviceModel = raw.deviceModel ?? formData.value.deviceModel
- formData.value.deviceCode =
- raw.deviceCode ?? raw.deviceSn ?? raw.deviceNo ?? formData.value.deviceCode
+ formData.value.deviceSn = raw.deviceSn ?? raw.deviceSn ?? raw.deviceNo ?? formData.value.deviceCode
formData.value.deployLocation =
- raw.deployLocation ??
- raw.address ??
- raw.location ??
- raw.deployAddress ??
- formData.value.deployLocation
+ raw.deployLocation ?? raw.address ?? raw.location ?? raw.deployAddress ?? formData.value.deployLocation
}
// 关闭弹框
--
Gitblit v1.9.3