From 3df4bc3c9b10c11e332f44226ac3d316a00e82a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E5=BE=AE=E4=B8=80=E7=AC=91?= <709648985@qq.com>
Date: Thu, 10 Jul 2025 13:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0=E8=93=9D?=
 =?UTF-8?q?=E7=89=99=E8=AE=BE=E5=A4=87=E7=9A=84=E8=93=9D=E7=89=99=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0,=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentManagement/devices/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index e62f049..fd7b37d 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -90,6 +90,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="deviceMac" label="设备MAC" />
+        <el-table-column prop="bluetoothName" label="蓝牙名称" />
         <el-table-column prop="deviceImei" label="设备IMEI" />
         <el-table-column prop="typeName" label="设备类型" />
         <el-table-column prop="bindingStatus" label="绑定状态">
@@ -370,7 +371,7 @@ const handleDelete = async (row?: deviceVO) => {
   // 批量删除逻辑
   let arrey = ids.value.map((item) => item.id);
   if (!row) {
-    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`) as any);
+    const [err] = await to(proxy?.$modal.confirm(`是否确认删除选中的 ${ids.value.length} 条数据？`));
     if (!err) {
       await api.deleteDevice(arrey);
       await getList();
@@ -379,7 +380,7 @@ const handleDelete = async (row?: deviceVO) => {
     return;
   }
   // 单行删除逻辑
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？') as any);
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除"' + row.deviceName + '"的数据项？'));
   if (!err) {
     await api.deleteDevice([row.id]);
     await getList();
@@ -466,6 +467,8 @@ const handleAdd = async () => {
   // 新增时默认不显示
   showMacField.value = false;
   showImeiField.value = false;
+  // 每次打开弹框时获取最新的设备类型数据
+  getDeviceType();
 };
 
 /** 修改按钮操作 */
@@ -473,6 +476,8 @@ const handleUpdate = async (row?: deviceForm) => {
   reset();
   dialog.visible = true;
   dialog.title = '修改设备';
+  // 每次打开弹框时获取最新的设备类型数据
+  getDeviceType();
   try {
     if (row) {
       Object.assign(form.value, row);
@@ -546,7 +551,9 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
 };
 
 // 覆盖默认的上传行为，可以自定义上传的实现
-const httpRequestImg = (parm) => { };
+const httpRequestImg = (parm): Promise<any> => { 
+  return Promise.resolve();
+};
 const beforeUpload = (file) => {
   const isLt2M = file.size / 1024 / 1024 < 2;
   const isJPG = file.type === "image/jpeg" || file.type === "image/png";