From caaacbee448574e173302ed02cc89ee1459ae648 Mon Sep 17 00:00:00 2001
From: huang <1724659546@qq.com>
Date: Sat, 20 Sep 2025 16:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DeviceList.vue | 84 ++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/components/DeviceList.vue b/src/components/DeviceList.vue
index 6bbdfa48..4f22f7a6 100644
--- a/src/components/DeviceList.vue
+++ b/src/components/DeviceList.vue
@@ -27,19 +27,27 @@
       </div>
       
       <!-- 设备列表 -->
-      <el-table v-else :data="devices" style="width: 100%">
-        <el-table-column prop="id" label="设备ID" width="180" />
-        <el-table-column prop="name" label="设备名称" width="180" />
-        <el-table-column prop="type" label="设备类型" />
-        <el-table-column prop="status" label="状态">
+      <el-table 
+        v-else 
+        :data="devices" 
+        style="width: 100%"
+        :fit="true"
+        table-layout="auto">
+        <el-table-column prop="id" label="设备ID" min-width="80" />
+        <el-table-column prop="name" label="设备名称" min-width="120" />
+        <el-table-column prop="type" label="设备类型" min-width="100">
           <template #default="scope">
-            <el-tag :type="scope.row.status === 'online' ? 'success' : 'danger'">
-              {{ scope.row.status === 'online' ? '在线' : '离线' }}
-            </el-tag>
+            {{ formatDeviceType(scope.row.type) }}
           </template>
         </el-table-column>
-        <el-table-column prop="lastUpdate" label="最后更新" />
-        <el-table-column label="操作">
+        <el-table-column prop="sub_type" label="设备子类型" min-width="100">
+          <template #default="scope">
+            {{ formatDeviceSubType(scope.row.sub_type) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="location" label="设备地址描述" min-width="150" />
+        <el-table-column prop="parentName" label="上级设备名" min-width="120" />
+        <el-table-column label="操作" min-width="120" align="center">
           <template #default="scope">
             <el-button size="small" @click="editDevice(scope.row)">编辑</el-button>
             <el-button size="small" type="danger" @click="deleteDevice(scope.row)">删除</el-button>
@@ -71,6 +79,7 @@ export default {
   data() {
     return {
       devices: [],
+      allDevices: [], // 存储所有设备用于查找上级设备
       loading: false,
       error: null,
       saving: false,
@@ -90,12 +99,22 @@ export default {
       
       try {
         const data = await deviceService.getDevices();
-        this.devices = data.map(device => ({
-          ...device,
-          // 格式化数据显示
-          type: this.formatDeviceType(device.type),
-          lastUpdate: device.updated_at || '-'
-        }));
+        // 保存所有设备数据
+        this.allDevices = data;
+        // 处理设备数据，添加上级设备名称
+        this.devices = data.map(device => {
+          // 查找上级设备名称
+          let parentName = '-';
+          if (device.parent_id) {
+            const parentDevice = data.find(d => d.id === device.parent_id);
+            parentName = parentDevice ? parentDevice.name : '-';
+          }
+          
+          return {
+            ...device,
+            parentName
+          };
+        });
       } catch (err) {
         this.error = err.message || '未知错误';
         console.error('加载设备列表失败:', err);
@@ -107,11 +126,24 @@ export default {
     // 格式化设备类型显示
     formatDeviceType(type) {
       const typeMap = {
-        'sensor': '传感器',
-        'controller': '控制器',
-        'camera': '摄像头'
+        'area_controller': '区域主控',
+        'device': '普通设备'
       };
-      return typeMap[type] || type;
+      return typeMap[type] || type || '-';
+    },
+    
+    // 格式化设备子类型显示
+    formatDeviceSubType(subType) {
+      const subTypeMap = {
+        '': '-',
+        'temperature': '温度传感器',
+        'humidity': '湿度传感器',
+        'ammonia': '氨气传感器',
+        'feed_valve': '饲料阀门',
+        'fan': '风扇',
+        'water_curtain': '水帘'
+      };
+      return subTypeMap[subType] || subType || '-';
     },
     
     addDevice() {
@@ -121,17 +153,7 @@ export default {
     },
     
     editDevice(device) {
-      // 注意：这里需要将显示值转换回API值
-      const typeMap = {
-        '传感器': 'sensor',
-        '控制器': 'controller',
-        '摄像头': 'camera'
-      };
-      
-      this.currentDevice = { 
-        ...device,
-        type: typeMap[device.type] || device.type
-      };
+      this.currentDevice = { ...device };
       this.isEdit = true;
       this.dialogVisible = true;
     },