From 898b9de165f130489ce92c644c3f8310b4bc1daf Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 27 Nov 2025 14:07:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(rfid):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=8A=E5=91=8A=E8=AD=A6=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将日期范围选择器改为支持时间范围选择
- 记录时间显示格式改为包含时分秒
- 设备在线及告警状态显示改用dict-tag组件
- 告警列表设备名称显示逻辑调整，去除备用字段显示
- 告警时间字段改为alarmTime，直接显示原始值
- 告警级别显示改用dict-tag组件以统一风格
- 替换原有接口为新的实时统计和位置树接口获取数据
- 实现从位置树中提取设备的工具方法
- 精简删除不再使用的告警列表加载方法及时间格式化函数
---
 src/views/index.vue                     | 89 +++++++++++++------------
 src/views/rfid/rfidReadRecord/index.vue |  4 +-
 2 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 3c2a5f3..eb7d088 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -67,16 +67,12 @@
             </el-table-column>
             <el-table-column prop="onlineStatus" label="在线状态" width="100" align="center">
               <template #default="{ row }">
-                <el-tag :type="row.onlineStatus === '1' ? 'success' : 'info'" size="small">
-                  {{ row.onlineStatus === '1' ? '在线' : '离线' }}
-                </el-tag>
+                <dict-tag :options="online_status" :value="row.onlineStatus"/>
               </template>
             </el-table-column>
             <el-table-column prop="alarmStatus" label="告警状态" width="100" align="center">
               <template #default="{ row }">
-                <el-tag :type="row.alarmStatus === '1' ? 'danger' : 'success'" size="small">
-                  {{ row.alarmStatus === '1' ? '告警' : '正常' }}
-                </el-tag>
+                <dict-tag :options="alarm_status" :value="row.alarmStatus"/>
               </template>
             </el-table-column>
           </el-table>
@@ -93,16 +89,14 @@
           <el-table :data="alarmList" border stripe max-height="400" empty-text="暂无数据">
             <el-table-column type="index" label="序号" width="60" align="center" />
             <el-table-column prop="deviceName" label="设备" min-width="100">
-              <template #default="{ row }">{{ row.deviceName || row.deviceCode || '-' }}</template>
+              <template #default="{ row }">{{ row.deviceName || '-' }}</template>
             </el-table-column>
-            <el-table-column prop="recordTime" label="时间" min-width="140">
-              <template #default="{ row }">{{ formatRecordTime(row.recordTime) }}</template>
+            <el-table-column prop="alarmTime" label="时间" min-width="140">
+              <template #default="{ row }">{{ row.alarmTime || '-' }}</template>
             </el-table-column>
             <el-table-column prop="alarmLevel" label="级别" width="80" align="center">
               <template #default="{ row }">
-                <el-tag :type="row.alarmLevel === '2' ? 'danger' : 'warning'" size="small">
-                  {{ row.alarmLevel === '2' ? '严重' : (row.alarmLevel === '1' ? '一般' : '-') }}
-                </el-tag>
+                <dict-tag :options="alarm_level" :value="row.alarmLevel"/>
               </template>
             </el-table-column>
             <el-table-column prop="alarmAction" label="行为" min-width="80">
@@ -116,11 +110,13 @@
 </template>
 
 <script setup name="Index" lang="ts">
-import { getDashboardStats } from "@/api/rfid/dashboard";
-import { getRfidDeviceList } from "@/api/rfid/rfidDevice";
-import { getRfidReadRecordList } from "@/api/rfid/rfidReadRecord";
-import type { RfidDeviceVO } from "@/api/rfid/rfidDevice/types";
-import type { RfidReadRecordVO } from "@/api/rfid/rfidReadRecord/types";
+import { getRealtimeStats, getLocationTree } from "@/api/rfid/dashboard";
+import type { LocationTreeNode, AlarmStatVO } from "@/api/rfid/dashboard/types";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { online_status, alarm_status, alarm_level } = toRefs<any>(
+  proxy?.useDict("online_status", "alarm_status", "alarm_level")
+);
 
 const stats = ref({
   totalDevices: 0,
@@ -128,16 +124,43 @@ const stats = ref({
   offlineDevices: 0,
   alarmDevices: 0
 });
+ 
+const deviceList = ref<LocationTreeNode[]>([]);
+const alarmList = ref<AlarmStatVO[]>([]);
 
-const deviceList = ref<RfidDeviceVO[]>([]);
-const alarmList = ref<RfidReadRecordVO[]>([]);
+/**
+ * 从位置树中提取设备节点列表（locationType = '3' 且存在 deviceId）
+ */
+const extractDeviceList = (nodes: LocationTreeNode[] = []): LocationTreeNode[] => {
+  const result: LocationTreeNode[] = [];
+  const stack: LocationTreeNode[] = [...nodes];
+
+  while (stack.length > 0) {
+    const node = stack.pop() as LocationTreeNode;
+    if (node.children && node.children.length > 0) {
+      stack.push(...node.children);
+    }
+    if (node.locationType === "3" && node.deviceId != null) {
+      result.push(node);
+    }
+  }
+
+  return result;
+};
 
 const loadStats = async () => {
   try {
-    const res = await getDashboardStats();
-    if (res.data) {
-      stats.value = res.data;
+    const res = await getRealtimeStats();
+    const data = res.data;
+    if (data && data.overview) {
+      stats.value = {
+        totalDevices: data.overview.deviceTotal ?? 0,
+        onlineDevices: data.overview.onlineCount ?? 0,
+        offlineDevices: data.overview.offlineCount ?? 0,
+        alarmDevices: data.overview.alarmCount ?? 0
+      };
     }
+    alarmList.value = data?.alarmStats || [];
   } catch (e) {
     console.error("获取统计数据失败", e);
   }
@@ -145,33 +168,17 @@ const loadStats = async () => {
 
 const loadDeviceList = async () => {
   try {
-    const res: any = await getRfidDeviceList({ isMarked: "1" } as any);
-    deviceList.value = res.data || [];
+    const res = await getLocationTree();
+    const tree = res.data || [];
+    deviceList.value = extractDeviceList(tree);
   } catch (e) {
     console.error("获取设备列表失败", e);
   }
 };
 
-const loadAlarmList = async () => {
-  try {
-    const res: any = await getRfidReadRecordList({ alarmFlag: "1" } as any);
-    alarmList.value = res.data || [];
-  } catch (e) {
-    console.error("获取告警记录失败", e);
-  }
-};
-
-const formatRecordTime = (val: any) => {
-  if (!val) {
-    return "-";
-  }
-  return String(val).replace("T", " ");
-};
-
 onMounted(() => {
   loadStats();
   loadDeviceList();
-  loadAlarmList();
 });
 </script>
 
diff --git a/src/views/rfid/rfidReadRecord/index.vue b/src/views/rfid/rfidReadRecord/index.vue
index 3ec0abd..7ed7055 100644
--- a/src/views/rfid/rfidReadRecord/index.vue
+++ b/src/views/rfid/rfidReadRecord/index.vue
@@ -26,7 +26,7 @@
               <el-date-picker
                 v-model="dateRange"
                 value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
+                type="datetimerange"
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
@@ -96,7 +96,7 @@
         <el-table-column label="条码信息" align="center" prop="barcode" v-if="columns[3].visible" />
         <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[4].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="是否告警" align="center" prop="alarmFlag" v-if="columns[5].visible">