From dd6cdf01e19bf142850caf11ed4df84e21a56c0e Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 19 Jul 2025 17:54:42 +0800
Subject: [PATCH] =?UTF-8?q?App=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/appUser/user-info-dialog.vue          | 6 +++---
 src/views/equipmentManagement/devices/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/appUser/user-info-dialog.vue b/src/views/appUser/user-info-dialog.vue
index 2647ec3..2cc1743 100644
--- a/src/views/appUser/user-info-dialog.vue
+++ b/src/views/appUser/user-info-dialog.vue
@@ -12,7 +12,7 @@
       <el-button icon="Refresh" @click="resetQuery">重置</el-button>
     </div>
     <!-- 表格 -->
-    <el-table v-loading="bindingLoading" :data="boundDevices" style="width: 100%; margin-top: 20px;" height="400">
+    <el-table v-loading="bindingLoading" :data="boundDevices" style="margin-top: 20px;">
       <el-table-column prop="deviceName" label="设备名称" />
       <el-table-column prop="devicePic" label="设备图片">
         <template #default="scope">
@@ -21,14 +21,14 @@
               <img :src="scope.row.devicePic" style="width: 40px; height: 40px; cursor: pointer;"
                 class="hover:opacity-80 transition-opacity" />
             </template>
-            <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px;" />
+            <img :src="scope.row.devicePic" />
           </el-popover>
         </template>
       </el-table-column>
       <el-table-column prop="deviceMac" label="设备MAC" />
       <el-table-column prop="deviceImei" label="设备IMEI" />
       <el-table-column prop="typeName" label="设备类型" />
-      <el-table-column prop="createTime" label="绑定日期" />
+      <el-table-column prop="bindingTime" label="绑定日期" />
       <el-table-column label="操作" width="100" align="center">
         <template #default="scope">
           <el-button type="danger" plain @click="handleUnbind(scope.row)">解绑</el-button>
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index 6d9423c..92b5363 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -116,7 +116,7 @@
             <el-tooltip v-if="scope.row.id !== 1 && scope.row.deviceStatus == 1" content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip v-if="scope.row.id !== 1" content="删除" placement="top">
+            <el-tooltip v-if="!scope.row.customerName && scope.row.deviceStatus == 1" content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.deviceStatus == 1 && !scope.row.customerName" content="分配" placement="top">