diff --git a/src/api/WarningList/index.ts b/src/api/WarningList/index.ts index e69de29..ff60453 100644 --- a/src/api/WarningList/index.ts +++ b/src/api/WarningList/index.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request'; +import { DemoQuery } from './types'; + +/** + * 设备告警分页列表 + * @param query id、deviceId、分页、时间范围等 + */ +export const listDemo = (query?: DemoQuery) => { + return request({ + url: '/device/deviceAlarm/list', + method: 'get', + params: query + }); +}; + +/** + * 处理告警(与后端约定:POST /device/deviceAlarm/edit?ids=1,2) + */ +export const updateDemo = (ids: string | number | Array) => { + const idsParam = Array.isArray(ids) ? ids.join(',') : String(ids); + return request({ + url: '/device/deviceAlarm/edit', + method: 'post', + params: { ids: idsParam } + }); +}; diff --git a/src/api/WarningList/types.ts b/src/api/WarningList/types.ts index e69de29..c77aaed 100644 --- a/src/api/WarningList/types.ts +++ b/src/api/WarningList/types.ts @@ -0,0 +1,26 @@ +/** 设备告警列表行(与 /device/deviceAlarm/list 返回一致) */ +export interface DemoVO { + id?: string | number; + deviceId?: string | number | null; + deviceName?: string | null; + userName?: string | null; + monitoringArea?: string | null; + alarmTime?: string | null; + status?: number | null; + userId?: string | number | null; + processingTime?: string | null; +} + +export interface DemoForm extends BaseEntity, DemoVO {} + +export interface DemoQuery extends PageQuery { + id?: string | number; + deviceId?: string | number; + deviceName?: string; + monitoringArea?: string; + status?: number; + userName?: string; + userId?: string | number; + beginTime?: string; + endTime?: string; +} diff --git a/src/api/equipmentList/index.ts b/src/api/equipmentList/index.ts index dc3dceb..acaa234 100644 --- a/src/api/equipmentList/index.ts +++ b/src/api/equipmentList/index.ts @@ -1,5 +1,5 @@ import request from '@/utils/request'; -import type { EquipmentList, DeviceInfoForm } from '@/api/equipmentList/types'; +import type { EquipmentList, DeviceInfoForm } from '@/api/equipmentList/types'; import { AxiosPromise } from 'axios'; import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types'; /** @@ -7,7 +7,7 @@ import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types'; * @param data 设备数据 * @returns AxiosPromise */ -export const addEquipment = (data: DemoForm)=> { +export const addEquipment = (data: DemoForm) => { return request({ url: '/device/info/add', method: 'post', @@ -44,20 +44,23 @@ export const getDeviceInfo = (id: string | number) => { * @param ids 设备主键列表(Query:ids=1,2,3) */ export const delDevice = (id: string | number | Array) => { + const idsParam = Array.isArray(id) ? id.join(',') : String(id); return request({ - url: '/demo/demo/' + id, - method: 'delete', + url: '/device/info/delete', + method: 'post', + params: { ids: idsParam } }); }; /** - * 激活设备 - * @param ids 设备数组(请求体:{ ids: [...] }) + * 唤醒设备 + * @param id 单个主键或主键数组(与删除相同:POST + Query,ids=1,2,3) */ -export const actDevice = (ids: Array) => { +export const actDevice = (id: string | number | Array) => { + const idsParam = Array.isArray(id) ? id.join(',') : String(id); return request({ url: '/device/info/activate', method: 'post', - params: { ids: ids.join(',') } + params: { ids: idsParam } }); }; diff --git a/src/views/WarningList/list.vue b/src/views/WarningList/list.vue index c788968..be7540a 100644 --- a/src/views/WarningList/list.vue +++ b/src/views/WarningList/list.vue @@ -4,17 +4,19 @@
- - + + - - + + + + - - + + - - + + 搜索 @@ -29,64 +31,70 @@ - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - + + - - + + - - + + 未处理 + 已处理 + {{ form.status ?? '-' }} + + + + + + -