From a045b8fc2dd53ae0f6b3c91be49006c18a72a3f9 Mon Sep 17 00:00:00 2001
From: Kven <2955163637@qq.com>
Date: Tue, 11 Mar 2025 22:03:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(iot):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85=E5=92=8C=E5=9C=B0=E5=9B=BE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了不必要的导入语句
- 优化了设备上报记录的展示逻辑，添加了详情弹窗
-修复了设备地图组件的样式问题
- 优化了产品 TSL 数据的请求逻辑，提高了数据加载效率
- 改进了设备列表中的在线状态展示，使用标签进行区分
---
 src/api/device.ts                             |  1 -
 .../iot/device/components/device-detail.vue   | 69 ++++++++++++++++---
 .../iot/device/components/device-map.vue      |  2 +-
 src/views/iot/device/index.vue                |  3 +-
 .../iot/product/components/product-tsl.vue    | 22 ++++--
 5 files changed, 77 insertions(+), 20 deletions(-)

diff --git a/src/api/device.ts b/src/api/device.ts
index 69d250a..a1a2209 100644
--- a/src/api/device.ts
+++ b/src/api/device.ts
@@ -1,5 +1,4 @@
 import axios from 'axios';
-import dashboard from '@/router/routes/modules/dashboard';
 
 export interface DeviceRecord {
   size: number;
diff --git a/src/views/iot/device/components/device-detail.vue b/src/views/iot/device/components/device-detail.vue
index a88836f..8bfb9b7 100644
--- a/src/views/iot/device/components/device-detail.vue
+++ b/src/views/iot/device/components/device-detail.vue
@@ -89,17 +89,27 @@
               <div>{{ dayjs(record.recordTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
             </template>
             <template #content="{ record }">
-              <div v-for="(value, key) in record.content" :key="key">
-                <strong>{{ key }}:</strong> {{ value }}
+              <div v-if="record.content">
+                <span v-for="(value, key, index) in record.content" :key="key">
+                  <template v-if="index === 0">
+                    <strong>{{ key }}:</strong> {{ value }}
+                  </template>
+                </span>
+                <span v-if="Object.keys(record.content).length > 1">. . . . . .</span>
               </div>
             </template>
+            <template #operations="{ record }">
+              <a-button type="text" @click="openDetailModal(record)">
+                <template #icon><icon-list /></template>
+                查看详情
+              </a-button>
+            </template>
 
 
           </a-table>
         </a-tab-pane>
         <a-tab-pane key="5" tab="设备地图" title="设备地图">
-          <DeviceMap :renderData=renderData />
-
+          <DeviceMap v-if="renderData.id" :renderData=renderData />
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -120,13 +130,31 @@
         <a-button class="editor-button" type="primary" @click="handleSubmit">确定</a-button>
       </template>
     </a-modal>
+
+    <a-modal
+      :visible="detailVisible"
+      @cancel="closeDetailModal"
+      title="上报记录详情"
+    >
+      <template #footer>
+        <a-button @click="closeDetailModal">关闭</a-button>
+      </template>
+      <div v-if="selectedRecord">
+        <p><strong>上报时间:</strong> {{ dayjs(selectedRecord.recordTime).format('YYYY-MM-DD HH:mm:ss') }}</p>
+        <div v-if="selectedRecord.content">
+          <div v-for="(value, key) in selectedRecord.content" :key="key">
+            <strong>{{ key }}:</strong> {{ value }}
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
 <script lang="ts" setup>
   import dayjs from 'dayjs';
   import { useRoute } from 'vue-router';
-  import { onMounted, reactive, ref } from 'vue';
+  import { onMounted, ref } from 'vue';
   import { Message } from '@arco-design/web-vue';
   import { queryDeviceDetail, queryDeviceRecord, sendCommand } from '@/api/device';
   import { queryServeDetail, queryServeList } from '@/api/tsl';
@@ -170,6 +198,11 @@
       dataIndex: 'content',
       slotName: 'content',
     },
+    {
+      title: '操作',
+      dataIndex: 'operations',
+      slotName: 'operations',
+    }
   ];
   const deviceServeColumns = [
     {
@@ -189,11 +222,26 @@
     },
   ];
   const activeKey = ref('1');
-  const renderData = ref({
-    deviceId: 0,
-    clientId: 1,
-    productId: 1
-  });
+
+  const detailVisible = ref(false);
+  const selectedRecord = ref<any>(null);
+
+  const openDetailModal = (record: any) => {
+    selectedRecord.value = record;
+    detailVisible.value = true;
+  };
+
+  const closeDetailModal = () => {
+    detailVisible.value = false;
+    selectedRecord.value = null;
+  };
+
+  const renderData = ref(
+    {
+      clientId: 0,
+      productId: 0,
+    }
+  );
   const deviceReportData = ref([]);
   const deviceServerData = ref([]);
   const fields = ref([]);
@@ -217,7 +265,6 @@
     activeKey.value = e;
   };
   const dynamicFormData = ref();
-  const formRef = ref();
   // 关闭
   const handleCancel = async () => {
     setVisible(false);
diff --git a/src/views/iot/device/components/device-map.vue b/src/views/iot/device/components/device-map.vue
index 28b8ca4..d10a853 100644
--- a/src/views/iot/device/components/device-map.vue
+++ b/src/views/iot/device/components/device-map.vue
@@ -1,7 +1,7 @@
 <template>
   <a-layout>
     <a-layout-content>
-      <div id="container"></div>
+      <div id="container" style="height: 600px"></div>
     </a-layout-content>
   </a-layout>
 </template>
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 5a35e4e..27cda9d 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -174,7 +174,8 @@
           {{ record.state == "UNACTIVATED" ? '未激活' : '激活'}}
         </template>
         <template #online="{ record }">
-          {{ record.online == true ? '是' : '否' }}
+          <a-tag v-if="record.online == true" color="green">在线</a-tag>
+          <a-tag v-else color="red">离线</a-tag>
         </template>
         <template #operations="{ record }">
           <a-button
diff --git a/src/views/iot/product/components/product-tsl.vue b/src/views/iot/product/components/product-tsl.vue
index daa0e17..7f827f7 100644
--- a/src/views/iot/product/components/product-tsl.vue
+++ b/src/views/iot/product/components/product-tsl.vue
@@ -616,13 +616,23 @@
       current: 1,
       productId: Id,
     };
-    const res1 = await queryServeList(params);
-    serveData.value = res1.data.records;
-    const res2 = await queryPropertyList(params);
-    propertyData.value = res2.data.records;
-    const res3 = await queryEventList(params);
-    eventData.value = res3.data.records;
+
+    try {
+      const [res1, res2, res3] = await Promise.all([
+        queryServeList(params),
+        queryPropertyList(params),
+        queryEventList(params),
+      ]);
+
+      serveData.value = res1.data.records;
+      propertyData.value = res2.data.records;
+      eventData.value = res3.data.records;
+    } catch (error) {
+      console.error('请求失败:', error);
+      Message.error('获取数据失败，请稍后重试');
+    }
   };
+
   const changeKey = (e: any) => {
     keyValue.value = e;
   };