From 29752a70af3a314bc22625481c9d94459e2d9b51 Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Fri, 6 Mar 2026 11:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E8=93=9D?=
 =?UTF-8?q?=E7=89=99&4G=E8=AE=BE=E5=A4=87=E6=97=B6=EF=BC=8CIEMI=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controlCenter/controlPanel/index.vue      |  2 +-
 .../equipmentManagement/devices/index.vue     | 49 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue
index 9345e2e..28c8500 100644
--- a/src/views/controlCenter/controlPanel/index.vue
+++ b/src/views/controlCenter/controlPanel/index.vue
@@ -37,7 +37,7 @@
                 <el-collapse-item name="1">
                   <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="queryFormRef">
                     <el-form-item label="设备类型" prop="deviceType">
-                      <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable>
+                      <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
                         <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                           :value="item.deviceTypeId" />
                       </el-select>
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index 053da91..79ecad4 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -248,7 +248,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="showImeiField">
+        <el-row  v-if="showImeiField">
           <el-col :span="24">
             <el-form-item label="设备IMEI" prop="deviceImei" required>
               <el-input v-model="form.deviceImei" placeholder="请输入设备IMEI" />
@@ -622,6 +622,7 @@ const handleAdd = async () => {
 };
 /** 修改按钮操作 */
 const handleUpdate = async (row?: deviceForm) => {
+  debugger;
   reset();
   dialog.visible = true;
   dialog.title = '修改设备';
@@ -663,29 +664,29 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
   showImeiField.value = false;
   communicationModeInfo.value = null;
   // 编辑时如果有值，根据已有值确定显示哪个字段
-  if (form.value.id) {
-    console.log('zheshi me1 ');
-    // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
-    const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
-    const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
-    if (hasMac && hasImei) {
-      //两个都有值：显示两个字段 + 都加校验
-      showMacField.value = true;
-      showImeiField.value = true;
-      console.log('两个字段都有值');
-    } else if (hasMac) {
-      showMacField.value = true;
-      showImeiField.value = false;
-      rules.value.deviceImei = [];
-      console.log('只有 Mac 有值');
-    } else if (hasImei) {
-      showImeiField.value = true;
-      showMacField.value = false;
-      rules.value.deviceMac = [];
-      console.log('只有 Imei 有值');
-    }
-    return;
-  }
+  // if (form.value.id) {
+  //   console.log('zheshi me1 ');
+  //   // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
+  //   const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
+  //   const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
+  //   if (hasMac && hasImei) {
+  //     //两个都有值：显示两个字段 + 都加校验
+  //     showMacField.value = true;
+  //     showImeiField.value = true;
+  //     console.log('两个字段都有值');
+  //   } else if (hasMac) {
+  //     showMacField.value = true;
+  //     showImeiField.value = false;
+  //     rules.value.deviceImei = [];
+  //     console.log('只有 Mac 有值');
+  //   } else if (hasImei) {
+  //     showImeiField.value = true;
+  //     showMacField.value = false;
+  //     rules.value.deviceMac = [];
+  //     console.log('只有 Imei 有值');
+  //   }
+  //   return;
+  // } 
   if (isProcessing) return;
   isProcessing = true;
   // 新增或编辑时没有值，根据设备类型获取通讯方式