From 209163eb36d9e0204f6d5ff33c150955c961cd96 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Fri, 9 May 2025 16:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B7=20UI(=E8=AE=BE=E5=A4=87):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=90=E8=AE=BE=E5=A4=87=E5=A1=91=E5=A3=B3=E6=96=AD?=
 =?UTF-8?q?=E8=B7=AF=E5=99=A8=E8=AF=A6=E6=83=85=E5=BC=80=E5=90=AF=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/device/index.vue                |  4 +--
 src/views/profile/DeviceDetailsView/index.vue | 30 +++++++++----------
 src/views/tenant/device/index.vue             |  4 +--
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 7311532d..46039cfb 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -379,9 +379,9 @@
                 </div>
                 <div class="card-footer">
                   <el-button icon="el-icon-search" type="text" @click="handleDetails(item)">查看详情</el-button>
-                  <el-divider direction="vertical"></el-divider>
+                  <el-button v-hasPermi="['iot:device:edit']" type="text"><el-divider direction="vertical"></el-divider></el-button>
                   <el-button v-hasPermi="['iot:device:edit']" icon="el-icon-edit" type="text" @click="handleUpdate(item)">修改</el-button>
-                  <el-divider direction="vertical"></el-divider>
+                  <el-button v-hasPermi="['iot:device:edit','iot:device:remove']" type="text"><el-divider direction="vertical"></el-divider></el-button>
                   <el-button v-if="item['parentId'] && item['parentId'] !== '0'" v-hasPermi="['iot:device:edit']" icon="el-icon-error" type="text" @click="handleDisassociate(item)">解绑</el-button>
                   <el-button v-else v-hasPermi="['iot:device:remove']" icon="el-icon-delete" type="text" @click="handleDelete(item)">删除</el-button>
                 </div>
diff --git a/src/views/profile/DeviceDetailsView/index.vue b/src/views/profile/DeviceDetailsView/index.vue
index 62936888..2f5ee183 100644
--- a/src/views/profile/DeviceDetailsView/index.vue
+++ b/src/views/profile/DeviceDetailsView/index.vue
@@ -8,14 +8,13 @@
       @changeEvent="viewDeviceChange($event)"
       @wsRealTImeMsg="wsRealTImeMsg($event)"
     ></device-select>
-    <div class="main-device-card">
-    <div :class="infoData.deviceType === 'GATEWAY_CONTROLLER' ? 'link-to-list is-widening': 'link-to-list'">
+    <div :class="infoData.deviceType === 'GATEWAY_CONTROLLER' ? 'link-to-list is-widening': 'link-to-list'" class="main-device-card">
       <el-button circle icon="el-icon-d-arrow-left" style="margin-left: 10px;" title="返回列表" @click="toTableClick"
         >返回列表</el-button
       >
       <el-button v-if="infoData.deviceType === 'GATEWAY_CONTROLLER'" circle title="批量升级" @click="batchUpgradeOpen">批量升级</el-button>
     </div>
-    <div class="info-tabs-circuit">
+    <div class="info-tabs-circuit main-device-card">
       <div v-show="breadcrumbList.length > 1" class="breadcrumb-wrap">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item
@@ -122,7 +121,6 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    </div>
     <div style="height: 0;">
         <!-- 添加或修改建筑类型对话框 -->
         <dialog-template
@@ -436,29 +434,29 @@ export default {
   .link-to-list {
     display: flex;
     color: #656363;
+    justify-content: flex-end;
     font-size: 20px;
-    height: 0;
-    background: #e4eaf3;
-    display: flex;
+    //height: 0;
+    //background: #e4eaf3;
     position: relative;
     top: 10px;
     z-index: 100;
-    width: 120px;
-    left: calc(100% - 120px);
+    //width: 120px;
+    //left: calc(100% - 120px);
     cursor: default;
     justify-content: flex-start;
     flex-wrap: nowrap;
     flex-direction: row-reverse;
     .el-button--medium.is-circle {
-      width: 25px;
-      height: 20px;
-      padding: 0;
+      //width: 25px;
+      //height: 20px;
+      padding: 10px;
       background: #0d8afd;
       color: #fff;
       font-size: 16px;
       border-radius: 5px;
-      height: 30px;
-      width: 100%;
+      //height: 30px;
+      //width: 100%;
       font-size: 14px;
     }
   }
@@ -468,8 +466,8 @@ export default {
   }
 
   .is-widening {
-    width: 220px;
-    left: calc(100% - 220px);
+    //width: 220px;
+    //left: calc(100% - 220px);
   }
 
   .info-tabs-circuit {
diff --git a/src/views/tenant/device/index.vue b/src/views/tenant/device/index.vue
index ae8ebc7a..6830f861 100644
--- a/src/views/tenant/device/index.vue
+++ b/src/views/tenant/device/index.vue
@@ -310,9 +310,9 @@
               </div>
               <div class="card-footer">
                 <el-button icon="el-icon-search" type="text" @click="handleDetails(item)">查看详情</el-button>
-                <el-divider direction="vertical"></el-divider>
+                <el-button v-hasPermi="['iot:device:edit']" type="text"><el-divider direction="vertical"></el-divider></el-button>
                 <el-button v-hasPermi="['iot:device:edit']" icon="el-icon-edit" type="text" @click="handleUpdate(item)">修改</el-button>
-                <el-divider direction="vertical"></el-divider>
+                <el-button v-hasPermi="['iot:device:edit','iot:device:remove']" type="text"><el-divider direction="vertical"></el-divider></el-button>
                 <el-button v-if="item['parentId'] && item['parentId'] !== '0'" v-hasPermi="['iot:device:edit']" icon="el-icon-error" type="text" @click="handleDisassociate(item)">解绑</el-button>
                 <el-button v-else v-hasPermi="['iot:device:remove']" icon="el-icon-delete" type="text" @click="handleDelete(item)">删除</el-button>
               </div>