From 1b4bfe6082518ac69cb684a9f216114cb2fe7612 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Thu, 31 Oct 2024 17:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=20fast(=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE):?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E7=A9=BA=E9=97=B4=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profileV2/DeviceManage/EDeviceTable.vue        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index 8e13b686..2e97531d 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -128,6 +128,9 @@
           </div>
         </template>
         <template slot="cardBody">
+          <div style="margin-bottom: 10px">
+            <el-tag v-for="(val,i) in devItem.deviceLabel" :key="i" size="mini"  style="margin-right: 5px;margin-bottom: 5px">{{ val }}</el-tag>
+          </div>
           <div class="object-device-body">
             <div class="card-body-info">
               <div class="card-body-left">
@@ -376,7 +379,14 @@ export default {
           this.queryParams
         )
       ).then((res) => {
-        this.list = res.rows;
+        let list = res.rows.map(item=>{
+          if(item.deviceLabel && item.deviceLabel[0] == '空间'){
+            item.deviceLabel.shift();
+            return item;
+          }
+          return item;
+        })
+        this.list = list || [];
         if (this.stompClient) {
           this.closeSocket();
         }
@@ -477,7 +487,7 @@ export default {
     justify-content: flex-start;
     .object-device-card {
       width: 285px;
-      height: 164px;
+      //height: 164px;
       background: #ffffff;
       border: 1px solid #e4ebf4;
       box-shadow: 0px 0px 8px 0px rgba(17, 76, 157, 0.26);