From 0e4273cda91826ee977a0a47879c994a1b206274 Mon Sep 17 00:00:00 2001
From: zzz62755 <627556311@qq.com>
Date: Tue, 25 Jul 2023 12:57:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=201=E3=80=81=E4=BF=AE=E6=94=B9=E5=AD=90?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE,=E5=B9=B6=E4=B8=94=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=E6=9C=AA=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/equipment/devices/list.vue              |  2 +-
 .../iot/equipment/devices/modules/childrenDialog.vue  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/equipment/devices/list.vue b/src/views/iot/equipment/devices/list.vue
index 5843520..b977a95 100644
--- a/src/views/iot/equipment/devices/list.vue
+++ b/src/views/iot/equipment/devices/list.vue
@@ -142,7 +142,7 @@
               </div>
             </div>
             <div class="btn-group">
-              <el-button class="cu-btn" type="success" icon="Box" plain @click="showChidrenDevices(item)">子设备</el-button>
+              <el-button v-if="item.productKey === 'openiitagateway01'" class="cu-btn" type="success" icon="Box" plain @click="showChidrenDevices(item)">子设备</el-button>
               <el-button class="cu-btn" type="primary" icon="EditPen" plain @click="crudRef.handleUpdate(item)">编辑</el-button>
               <el-button class="cu-btn" type="warning" icon="View" plain @click="handleView(item)">详情</el-button>
               <el-divider direction="vertical" />
diff --git a/src/views/iot/equipment/devices/modules/childrenDialog.vue b/src/views/iot/equipment/devices/modules/childrenDialog.vue
index 9624966..c0fa6d4 100644
--- a/src/views/iot/equipment/devices/modules/childrenDialog.vue
+++ b/src/views/iot/equipment/devices/modules/childrenDialog.vue
@@ -15,7 +15,7 @@
       menu-slot
     >
       <template #state="scope">
-        <el-tag v-if="scope.row.state.online" type="success" size="small">在线</el-tag>
+        <el-tag v-if="scope.row.state?.online" type="success" size="small">在线</el-tag>
         <el-tag v-else type="danger" size="small">离线</el-tag>
       </template>
       <template #menuSlot="scope">
@@ -31,6 +31,7 @@
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { getChildrenDeviceList } from '../../api/devices.api'
+import { deleteDevices } from '../../api/devices.api'
 
 import { ElPopconfirm } from 'element-plus'
 import YtTable from '@/components/common/yt-table'
@@ -119,8 +120,12 @@ const data = ref([
   }
 ])
 
-const handleDelete = (row: any) => {
-  console.log(row)
+const handleDelete = async (row: any) => {
+  state.loading = true
+  await deleteDevices(row.id)
+  ElMessage.success('删除成功!')
+  state.loading = false
+  getData()
 }
 
 const getData = () => {
-- 
Gitee