From 4edc4588d295ffec0db45988a25926a50d147819 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 18 May 2026 15:07:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96RFID=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=E4=B8=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 将三处any类型的params替换为Record<string, unknown>
2. 为接口方法添加Partial参数与返回值类型声明
3. 简化字典工具调用写法
4. 新增读取记录批量删除按日期分表逻辑
5. 修复设备新增默认状态初始化问题
---
 src/api/rfid/rfidDevice/index.ts        |  2 +-
 src/api/rfid/rfidDevice/types.ts        |  2 +-
 src/api/rfid/rfidLocation/index.ts      |  2 +-
 src/api/rfid/rfidLocation/types.ts      |  2 +-
 src/api/rfid/rfidReadRecord/index.ts    |  2 +-
 src/api/rfid/rfidReadRecord/types.ts    |  7 +++++-
 src/views/rfid/rfidDevice/index.vue     | 11 +++++----
 src/views/rfid/rfidLocation/index.vue   |  3 ++-
 src/views/rfid/rfidReadRecord/index.vue | 32 ++++++++++++++++++++-----
 9 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/api/rfid/rfidDevice/index.ts b/src/api/rfid/rfidDevice/index.ts
index c72efe3..53044c3 100644
--- a/src/api/rfid/rfidDevice/index.ts
+++ b/src/api/rfid/rfidDevice/index.ts
@@ -66,7 +66,7 @@ export const delRfidDevice = (id: string | number | Array<string | number>) => {
  * 获取全部设备信息列表（用于下拉、首页等场景）
  * @param query
  */
-export const getRfidDeviceList = (query?: RfidDeviceQuery) => {
+export const getRfidDeviceList = (query?: Partial<RfidDeviceQuery>): AxiosPromise<RfidDeviceVO[]> => {
   return request({
     url: '/rfid/rfidDevice/getRfidDeviceList',
     method: 'get',
diff --git a/src/api/rfid/rfidDevice/types.ts b/src/api/rfid/rfidDevice/types.ts
index 2eb1a57..1d6ade3 100644
--- a/src/api/rfid/rfidDevice/types.ts
+++ b/src/api/rfid/rfidDevice/types.ts
@@ -229,5 +229,5 @@ export interface RfidDeviceQuery extends PageQuery {
   /**
    * 日期范围参数
    */
-  params?: any;
+  params?: Record<string, unknown>;
 }
diff --git a/src/api/rfid/rfidLocation/index.ts b/src/api/rfid/rfidLocation/index.ts
index 6e19107..25bbde1 100644
--- a/src/api/rfid/rfidLocation/index.ts
+++ b/src/api/rfid/rfidLocation/index.ts
@@ -20,7 +20,7 @@ export const listRfidLocation = (query?: RfidLocationQuery): AxiosPromise<RfidLo
  * 获取全部位置信息列表（用于下拉、树选择等场景）
  * @param query
  */
-export const getRfidLocationList = (query?: RfidLocationQuery) => {
+export const getRfidLocationList = (query?: Partial<RfidLocationQuery>): AxiosPromise<RfidLocationVO[]> => {
   return request({
     url: '/rfid/rfidLocation/getRfidLocationList',
     method: 'get',
diff --git a/src/api/rfid/rfidLocation/types.ts b/src/api/rfid/rfidLocation/types.ts
index 2f09ba8..fdeab85 100644
--- a/src/api/rfid/rfidLocation/types.ts
+++ b/src/api/rfid/rfidLocation/types.ts
@@ -168,5 +168,5 @@ export interface RfidLocationQuery {
   /**
    * 日期范围参数
    */
-  params?: any;
+  params?: Record<string, unknown>;
 }
diff --git a/src/api/rfid/rfidReadRecord/index.ts b/src/api/rfid/rfidReadRecord/index.ts
index 5b8b07e..de96d92 100644
--- a/src/api/rfid/rfidReadRecord/index.ts
+++ b/src/api/rfid/rfidReadRecord/index.ts
@@ -70,7 +70,7 @@ export const delRfidReadRecord = (id: string | number | Array<string | number>,
  * 获取全部读取记录列表（用于首页告警统计等场景）
  * @param query
  */
-export const getRfidReadRecordList = (query?: RfidReadRecordQuery) => {
+export const getRfidReadRecordList = (query?: Partial<RfidReadRecordQuery>): AxiosPromise<RfidReadRecordVO[]> => {
   return request({
     url: '/rfid/rfidReadRecord/getRfidReadRecordList',
     method: 'get',
diff --git a/src/api/rfid/rfidReadRecord/types.ts b/src/api/rfid/rfidReadRecord/types.ts
index e75605f..dcff98d 100644
--- a/src/api/rfid/rfidReadRecord/types.ts
+++ b/src/api/rfid/rfidReadRecord/types.ts
@@ -19,6 +19,11 @@ export interface RfidReadRecordVO {
    */
   deviceName?: string;
 
+  /**
+   * 位置别名
+   */
+  locationAlias?: string;
+
   /**
    * 读取状态(1-成功;0-失败)
    */
@@ -161,5 +166,5 @@ export interface RfidReadRecordQuery extends PageQuery {
   /**
    * 日期范围参数
    */
-  params?: any;
+  params?: Record<string, unknown>;
 }
diff --git a/src/views/rfid/rfidDevice/index.vue b/src/views/rfid/rfidDevice/index.vue
index b06dc62..fae94c2 100644
--- a/src/views/rfid/rfidDevice/index.vue
+++ b/src/views/rfid/rfidDevice/index.vue
@@ -253,9 +253,10 @@
 import { listRfidDevice, getRfidDevice, delRfidDevice, addRfidDevice, updateRfidDevice } from "@/api/rfid/rfidDevice";
 import { RfidDeviceVO, RfidDeviceQuery, RfidDeviceForm } from '@/api/rfid/rfidDevice/types';
 import { getRfidLocationList } from "@/api/rfid/rfidLocation";
+import { useDict } from '@/utils/dict';
 
-    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { alarm_status, online_status, is_marked } = toRefs<any>(proxy?.useDict('alarm_status', 'online_status', 'is_marked'));
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { alarm_status, online_status, is_marked } = toRefs(useDict('alarm_status', 'online_status', 'is_marked'));
 
 type RfidLocationOption = {
   id: number;
@@ -309,10 +310,12 @@ const initFormData: RfidDeviceForm = {
   deviceName: undefined,
   locationId: undefined,
   deviceAddress: undefined,
+  // RFID 读写器默认使用现场采集服务约定端口，新建时允许按实际设备调整。
   devicePort: 20108,
   readFrequency: undefined,
-  onlineStatus: undefined,
-  alarmStatus: undefined,
+  // 新增设备默认按“在线/正常”初始化，避免状态为空导致看板统计口径不稳定。
+  onlineStatus: '1',
+  alarmStatus: '0',
   isMarked: '1',
   remark: undefined,
   createdBy: undefined,
diff --git a/src/views/rfid/rfidLocation/index.vue b/src/views/rfid/rfidLocation/index.vue
index c063491..a21f4a7 100644
--- a/src/views/rfid/rfidLocation/index.vue
+++ b/src/views/rfid/rfidLocation/index.vue
@@ -199,6 +199,7 @@
 <script setup name="RfidLocation" lang="ts">
 import { listRfidLocation, getRfidLocation, delRfidLocation, addRfidLocation, updateRfidLocation, getRfidLocationList } from "@/api/rfid/rfidLocation";
 import { RfidLocationVO, RfidLocationQuery, RfidLocationForm } from '@/api/rfid/rfidLocation/types';
+import { useDict } from '@/utils/dict';
 
 type RfidLocationOption = {
   id: number;
@@ -208,7 +209,7 @@ type RfidLocationOption = {
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const { location_type, is_marked } = toRefs<any>(proxy?.useDict('location_type', 'is_marked'));
+const { location_type, is_marked } = toRefs(useDict('location_type', 'is_marked'));
 
 const rfidLocationList = ref<RfidLocationVO[]>([]);
 const rfidLocationOptions = ref<RfidLocationOption[]>([]);
diff --git a/src/views/rfid/rfidReadRecord/index.vue b/src/views/rfid/rfidReadRecord/index.vue
index 909e61e..c9f2adb 100644
--- a/src/views/rfid/rfidReadRecord/index.vue
+++ b/src/views/rfid/rfidReadRecord/index.vue
@@ -202,9 +202,10 @@ import { listRfidReadRecord, getRfidReadRecord, delRfidReadRecord, addRfidReadRe
 import { RfidReadRecordVO, RfidReadRecordQuery, RfidReadRecordForm } from '@/api/rfid/rfidReadRecord/types';
 import { getRfidDeviceList } from "@/api/rfid/rfidDevice";
 import type { RfidDeviceVO } from '@/api/rfid/rfidDevice/types';
+import { useDict } from '@/utils/dict';
 
-    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { read_status, alarm_level, alarm_flag } = toRefs<any>(proxy?.useDict('read_status', 'alarm_level', 'alarm_flag'));
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { read_status, alarm_level, alarm_flag } = toRefs(useDict('read_status', 'alarm_level', 'alarm_flag'));
 
 const rfidReadRecordList = ref<RfidReadRecordVO[]>([]);
 const buttonLoading = ref(false);
@@ -213,6 +214,7 @@ const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
 // 当前选中行的记录时间（用于分表定位）
 const selectedRecordTimes = ref<string[]>([]);
+const selectedRecords = ref<RfidReadRecordVO[]>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
@@ -318,7 +320,7 @@ const getList = async () => {
 
 /** 加载设备下拉（设备名称），使用 getRfidDeviceList 获取全量数据 */
 const loadDeviceOptions = async () => {
-	const res: any = await getRfidDeviceList({ isMarked: "1" } as any);
+	const res = await getRfidDeviceList({ isMarked: "1" });
 	deviceOptions.value = res.data || [];
 }
 
@@ -351,12 +353,29 @@ const resetQuery = () => {
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: RfidReadRecordVO[]) => {
   ids.value = selection.map(item => item.id);
+  selectedRecords.value = selection;
   // 保存选中行的记录时间，用于分表定位
   selectedRecordTimes.value = selection.map(item => item.recordTime?.substring(0, 10) || '');
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
+/** 按记录日期分组删除，避免跨天批量删除时只打到第一张分表 */
+const buildDeleteGroups = (row?: RfidReadRecordVO): Map<string, Array<string | number>> => {
+  const records = row ? [row] : selectedRecords.value;
+  const deleteGroups = new Map<string, Array<string | number>>();
+  records.forEach((record) => {
+    const queryDate = record.recordTime?.substring(0, 10);
+    if (!queryDate) {
+      throw new Error("读取记录缺少记录时间，无法定位分表");
+    }
+    const groupIds = deleteGroups.get(queryDate) || [];
+    groupIds.push(record.id);
+    deleteGroups.set(queryDate, groupIds);
+  });
+  return deleteGroups;
+}
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
@@ -396,12 +415,13 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: RfidReadRecordVO) => {
   const _ids = row?.id || ids.value;
-  // 获取查询日期（用于分表定位）
-  const queryDate = row?.recordTime?.substring(0, 10) || selectedRecordTimes.value[0];
+  const deleteGroups = buildDeleteGroups(row);
   try {
     await proxy?.$modal.confirm('是否确认删除读取记录编号为"' + _ids + '"的数据项？');
     loading.value = true;
-    await delRfidReadRecord(_ids, queryDate);
+    for (const [queryDate, groupIds] of deleteGroups) {
+      await delRfidReadRecord(groupIds, queryDate);
+    }
     proxy?.$modal.msgSuccess("删除成功");
     await getList();
   } finally {