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) => { * 获取全部设备信息列表(用于下拉、首页等场景) * @param query */ -export const getRfidDeviceList = (query?: RfidDeviceQuery) => { +export const getRfidDeviceList = (query?: Partial): AxiosPromise => { 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; } 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 { +export const getRfidLocationList = (query?: Partial): AxiosPromise => { 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; } 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, * 获取全部读取记录列表(用于首页告警统计等场景) * @param query */ -export const getRfidReadRecordList = (query?: RfidReadRecordQuery) => { +export const getRfidReadRecordList = (query?: Partial): AxiosPromise => { 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; } 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(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 @@