From fec0753d9be66840d17a0742d644710944a80f3e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 28 Jan 2025 12:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91Bpm=EF=BC=9A=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E5=8E=86=E5=8F=B2=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/device/detail/DeviceDataDetail.vue |  5 +++-
 .../device/device/detail/DeviceDetailsLog.vue | 23 ++++++-------------
 .../device/detail/DeviceDetailsModel.vue      |  4 ++--
 src/views/iot/device/device/detail/index.vue  |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/views/iot/device/device/detail/DeviceDataDetail.vue b/src/views/iot/device/device/detail/DeviceDataDetail.vue
index c2723ec7..b675e99d 100644
--- a/src/views/iot/device/device/detail/DeviceDataDetail.vue
+++ b/src/views/iot/device/device/detail/DeviceDataDetail.vue
@@ -1,4 +1,4 @@
-<!-- TODO 芋艿：待 review -->
+<!-- 设备物模型 -> 运行状态 -> 查看数据（设备的属性值历史）-->
 <template>
   <Dialog title="查看数据" v-model="dialogVisible">
     <ContentWrap>
@@ -32,6 +32,9 @@
         </el-form-item>
       </el-form>
     </ContentWrap>
+
+    <!-- TODO @haohao：可参考阿里云 IoT，改成“图标”、“表格”两个选项 -->
+    <!-- 列表 -->
     <ContentWrap>
       <el-table v-loading="detailLoading" :data="list" :stripe="true" :show-overflow-tooltip="true">
         <el-table-column
diff --git a/src/views/iot/device/device/detail/DeviceDetailsLog.vue b/src/views/iot/device/device/detail/DeviceDetailsLog.vue
index 69ba696b..8bbad400 100644
--- a/src/views/iot/device/device/detail/DeviceDetailsLog.vue
+++ b/src/views/iot/device/device/detail/DeviceDetailsLog.vue
@@ -34,10 +34,10 @@
     </el-form>
 
     <!-- 日志列表 -->
-    <el-table v-loading="loading" :data="logList" :stripe="true" class="whitespace-nowrap">
-      <el-table-column label="时间" align="center" prop="time" width="180">
+    <el-table v-loading="loading" :data="list" :stripe="true" class="whitespace-nowrap">
+      <el-table-column label="时间" align="center" prop="ts" width="180">
         <template #default="scope">
-          {{ formatDate(scope.row.time) }}
+          {{ formatDate(scope.row.ts) }}
         </template>
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type" width="120" />
@@ -78,7 +78,7 @@ const queryParams = reactive({
 // 列表数据
 const loading = ref(false)
 const total = ref(0)
-const logList = ref([]) // TODO @super：logList -> list，简洁一点。因为当前就一个 table 哈
+const list = ref([])
 const autoRefresh = ref(false)
 let timer: any = null // TODO @super：autoRefreshEnable，autoRefreshTimer；对应上
 
@@ -96,18 +96,9 @@ const getLogList = async () => {
   if (!props.deviceKey) return
   loading.value = true
   try {
-    const res = await DeviceApi.getDeviceLogPage(queryParams)
-    total.value = res.total
-    // TODO @super：尽量不转换
-    logList.value = res.list.map((item: any) => {
-      const log = {
-        time: item.reportTime,
-        type: item.type,
-        subType: item.subType,
-        content: item.content
-      }
-      return log
-    })
+    const data = await DeviceApi.getDeviceLogPage(queryParams)
+    total.value = data.total
+    list.value = data.list
   } finally {
     loading.value = false
   }
diff --git a/src/views/iot/device/device/detail/DeviceDetailsModel.vue b/src/views/iot/device/device/detail/DeviceDetailsModel.vue
index e83c61d0..374fd240 100644
--- a/src/views/iot/device/device/detail/DeviceDetailsModel.vue
+++ b/src/views/iot/device/device/detail/DeviceDetailsModel.vue
@@ -44,6 +44,7 @@
               <el-table-column label="属性标识符" align="center" prop="identifier" />
               <el-table-column label="属性名称" align="center" prop="name" />
               <el-table-column label="数据类型" align="center" prop="dataType" />
+              <el-table-column label="属性值" align="center" prop="value" />
               <el-table-column
                 label="更新时间"
                 align="center"
@@ -51,7 +52,6 @@
                 :formatter="dateFormatter"
                 width="180px"
               />
-              <el-table-column label="最新值" align="center" prop="value" />
               <el-table-column label="操作" align="center">
                 <template #default="scope">
                   <el-button
@@ -59,7 +59,7 @@
                     type="primary"
                     @click="openDetail(props.device.id, scope.row.identifier)"
                   >
-                    查看数据
+                    历史
                   </el-button>
                 </template>
               </el-table-column>
diff --git a/src/views/iot/device/device/detail/index.vue b/src/views/iot/device/device/detail/index.vue
index ed0b013a..8e51503d 100644
--- a/src/views/iot/device/device/detail/index.vue
+++ b/src/views/iot/device/device/detail/index.vue
@@ -75,6 +75,6 @@ onMounted(async () => {
     return
   }
   await getDeviceData(id)
-  activeTab.value = route.query.tab as string
+  activeTab.value = (route.query.tab as string) || 'info'
 })
 </script>