forked from dyf/dyf-vue-ui
报警列表卡片,模式页面布局修改,估计播放,优化体验
This commit is contained in:
@ -9,7 +9,8 @@ export interface deviceQuery {
|
||||
personnelBy: string;
|
||||
communicationMode: string;
|
||||
pageSize: Number;
|
||||
deviceType: string
|
||||
deviceType: string;
|
||||
content:string
|
||||
|
||||
}
|
||||
export interface deviceVO {
|
||||
|
||||
@ -15,9 +15,8 @@ export const deviceInstructionRecord = (params) => {
|
||||
params: params
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// 导出
|
||||
export default {
|
||||
devicegroupList,
|
||||
deviceInstructionRecord,
|
||||
deviceInstructionRecord
|
||||
};
|
||||
@ -8,6 +8,7 @@ export interface deviceQuery {
|
||||
deviceType: string;
|
||||
startTime: string; // 接口要求的开始时间字段
|
||||
endTime: string // 接口要求的结束时间字段
|
||||
content:string
|
||||
}
|
||||
export interface deviceVO {
|
||||
id: number; // 设备ID
|
||||
|
||||
23
src/api/controlCenter/historyjectory/index.ts
Normal file
23
src/api/controlCenter/historyjectory/index.ts
Normal file
@ -0,0 +1,23 @@
|
||||
import request from '@/utils/request';
|
||||
// 轨迹记录
|
||||
export const devicelocationHistory = (params) => {
|
||||
return request({
|
||||
url: '/api/device/locationHistory',
|
||||
method: 'get',
|
||||
params: params
|
||||
});
|
||||
};
|
||||
// 轨迹播放
|
||||
export const getLocationHistoryDetail = (params) => {
|
||||
return request({
|
||||
url: '/api/device/getLocationHistoryDetail',
|
||||
method: 'get',
|
||||
params: params
|
||||
});
|
||||
};
|
||||
|
||||
// 导出
|
||||
export default {
|
||||
devicelocationHistory,
|
||||
getLocationHistoryDetail
|
||||
};
|
||||
22
src/api/controlCenter/historyjectory/types.ts
Normal file
22
src/api/controlCenter/historyjectory/types.ts
Normal file
@ -0,0 +1,22 @@
|
||||
export interface deviceQuery {
|
||||
groupId: string;
|
||||
pageNum: number;
|
||||
deviceName: string;
|
||||
deviceMac: string;
|
||||
deviceImei: string;
|
||||
pageSize: Number;
|
||||
deviceType: string;
|
||||
startTime: string; // 接口要求的开始时间字段
|
||||
endTime: string // 接口要求的结束时间字段
|
||||
content: string
|
||||
}
|
||||
export interface deviceVO {
|
||||
id: number; // 设备ID
|
||||
deviceName: string; // 设备名称(对应子组件的device.name)
|
||||
typeName: string; // 设备类型/型号(对应子组件的device.model)
|
||||
onlineStatus: 0 | 1; // 设备状态(0=失效/离线,1=正常/在线,对应子组件的device.status)
|
||||
lng?: number; // 经度(地图打点用)
|
||||
lat?: number; // 纬度(地图打点用)
|
||||
// 其他字段...
|
||||
}
|
||||
|
||||
@ -1,63 +1,63 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { EquipmentAlarmRecordVO, EquipmentAlarmRecordForm, EquipmentAlarmRecordQuery } from '@/api/equipmentAlarmRecord/types';
|
||||
import { AlarmVO, AlarmForm, AlarmQuery } from '@/api/equipment/alarm/types';
|
||||
|
||||
/**
|
||||
* 查询设备报警记录列表
|
||||
* 查询设备告警列表
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listEquipmentAlarmRecord = (query?: EquipmentAlarmRecordQuery): AxiosPromise<EquipmentAlarmRecordVO[]> => {
|
||||
export const listAlarm = (query?: AlarmQuery): AxiosPromise<AlarmVO[]> => {
|
||||
return request({
|
||||
url: '/equipment/equipmentAlarmRecord/list',
|
||||
url: 'api/equipment/alarm/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询设备报警记录详细
|
||||
* 查询设备告警详细
|
||||
* @param id
|
||||
*/
|
||||
export const getEquipmentAlarmRecord = (id: string | number): AxiosPromise<EquipmentAlarmRecordVO> => {
|
||||
export const getAlarm = (id: string | number): AxiosPromise<AlarmVO> => {
|
||||
return request({
|
||||
url: '/equipment/equipmentAlarmRecord/' + id,
|
||||
url: '/equipment/alarm/' + id,
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 新增设备报警记录
|
||||
* 新增设备告警
|
||||
* @param data
|
||||
*/
|
||||
export const addEquipmentAlarmRecord = (data: EquipmentAlarmRecordForm) => {
|
||||
export const addAlarm = (data: AlarmForm) => {
|
||||
return request({
|
||||
url: '/equipment/equipmentAlarmRecord',
|
||||
url: '/equipment/alarm',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 修改设备报警记录
|
||||
* 修改设备告警
|
||||
* @param data
|
||||
*/
|
||||
export const updateEquipmentAlarmRecord = (data: EquipmentAlarmRecordForm) => {
|
||||
export const updateAlarm = (data: AlarmForm) => {
|
||||
return request({
|
||||
url: '/equipment/equipmentAlarmRecord',
|
||||
url: '/equipment/alarm',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 删除设备报警记录
|
||||
* 删除设备告警
|
||||
* @param id
|
||||
*/
|
||||
export const delEquipmentAlarmRecord = (id: string | number | Array<string | number>) => {
|
||||
export const delAlarm = (id: string | number | Array<string | number>) => {
|
||||
return request({
|
||||
url: '/equipment/equipmentAlarmRecord/' + id,
|
||||
url: '/equipment/alarm/' + id,
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
|
||||
@ -1,82 +1,39 @@
|
||||
export interface EquipmentAlarmRecordVO {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 报警设备id
|
||||
*/
|
||||
deviceId: string | number;
|
||||
|
||||
/**
|
||||
* 设备IMEI
|
||||
*/
|
||||
deviceImei: string;
|
||||
|
||||
/**
|
||||
* 设备MAC
|
||||
*/
|
||||
deviceMac: string;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
export interface AlarmVO {
|
||||
startTime: string;
|
||||
treatmentState?: string | number
|
||||
deviceAction?: string | number;
|
||||
deviceName: string;
|
||||
|
||||
/**
|
||||
* 所属代理(客户)
|
||||
*/
|
||||
agent: number;
|
||||
|
||||
/**
|
||||
* 绑定app用户
|
||||
*/
|
||||
bindApp: number;
|
||||
|
||||
/**
|
||||
* 报警类型
|
||||
*/
|
||||
alarmType: number;
|
||||
|
||||
/**
|
||||
* 报警编码
|
||||
|
||||
*/
|
||||
alarmCode: string;
|
||||
|
||||
/**
|
||||
* 报警描述
|
||||
*/
|
||||
alarmDescription: string;
|
||||
|
||||
/**
|
||||
* 报警时间
|
||||
*/
|
||||
alarmTime: string;
|
||||
|
||||
dataSource: string;
|
||||
content: string;
|
||||
longitude: number;
|
||||
latitude: number;
|
||||
location: string;
|
||||
queryTime1?: string | number;
|
||||
queryTime2?: string | number;
|
||||
durationTime: string;
|
||||
deviceTypeName: string;
|
||||
deviceImei: string;
|
||||
deviceMac: string;
|
||||
devicePic:string;
|
||||
finishTime: string;
|
||||
|
||||
}
|
||||
|
||||
export interface EquipmentAlarmRecordForm extends BaseEntity {
|
||||
export interface AlarmForm extends BaseEntity {
|
||||
/**
|
||||
*
|
||||
* ID
|
||||
*/
|
||||
id?: string | number;
|
||||
|
||||
/**
|
||||
* 报警设备id
|
||||
* 设备ID
|
||||
*/
|
||||
deviceId?: string | number;
|
||||
|
||||
/**
|
||||
* 设备IMEI
|
||||
* 报警事项
|
||||
*/
|
||||
deviceImei?: string;
|
||||
|
||||
/**
|
||||
* 设备MAC
|
||||
*/
|
||||
deviceMac?: string;
|
||||
deviceAction?: string;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
@ -84,54 +41,69 @@ export interface EquipmentAlarmRecordForm extends BaseEntity {
|
||||
deviceName?: string;
|
||||
|
||||
/**
|
||||
* 所属代理(客户)
|
||||
* 数据来源
|
||||
*/
|
||||
agent?: number;
|
||||
dataSource?: string;
|
||||
|
||||
/**
|
||||
* 绑定app用户
|
||||
* 内容
|
||||
*/
|
||||
bindApp?: number;
|
||||
content?: string;
|
||||
|
||||
/**
|
||||
* 报警类型
|
||||
* 设备类型
|
||||
*/
|
||||
alarmType?: number;
|
||||
deviceType?: number;
|
||||
|
||||
/**
|
||||
* 报警编码
|
||||
* 经度
|
||||
|
||||
*/
|
||||
alarmCode?: string;
|
||||
longitude?: number;
|
||||
|
||||
/**
|
||||
* 报警描述
|
||||
* 纬度
|
||||
*/
|
||||
alarmDescription?: string;
|
||||
latitude?: number;
|
||||
|
||||
/**
|
||||
* 报警时间
|
||||
* 报警位置
|
||||
*/
|
||||
alarmTime?: string;
|
||||
location?: string;
|
||||
|
||||
/**
|
||||
* 报警开始时间
|
||||
*/
|
||||
startTime?: string;
|
||||
|
||||
/**
|
||||
* 报警结束时间
|
||||
*/
|
||||
finishTime?: string;
|
||||
|
||||
/**
|
||||
* 报警持续时间
|
||||
*/
|
||||
durationTime?: string;
|
||||
|
||||
/**
|
||||
* 0已处理,1未处理
|
||||
*/
|
||||
treatmentState?: number;
|
||||
|
||||
}
|
||||
|
||||
export interface EquipmentAlarmRecordQuery extends PageQuery {
|
||||
export interface AlarmQuery extends PageQuery {
|
||||
|
||||
/**
|
||||
* 报警设备id
|
||||
* 设备ID
|
||||
*/
|
||||
deviceId?: string | number;
|
||||
|
||||
/**
|
||||
* 设备IMEI
|
||||
* 报警事项
|
||||
*/
|
||||
deviceImei?: string;
|
||||
|
||||
/**
|
||||
* 设备MAC
|
||||
*/
|
||||
deviceMac?: string;
|
||||
deviceAction?: string;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
@ -139,40 +111,60 @@ export interface EquipmentAlarmRecordQuery extends PageQuery {
|
||||
deviceName?: string;
|
||||
|
||||
/**
|
||||
* 所属代理(客户)
|
||||
* 数据来源
|
||||
*/
|
||||
agent?: number;
|
||||
dataSource?: string;
|
||||
|
||||
/**
|
||||
* 绑定app用户
|
||||
* 内容
|
||||
*/
|
||||
bindApp?: number;
|
||||
content?: string;
|
||||
|
||||
/**
|
||||
* 报警类型
|
||||
* 设备类型
|
||||
*/
|
||||
alarmType?: number;
|
||||
deviceType?: number;
|
||||
|
||||
/**
|
||||
* 报警编码
|
||||
* 经度
|
||||
|
||||
*/
|
||||
alarmCode?: string;
|
||||
longitude?: number;
|
||||
|
||||
/**
|
||||
* 报警描述
|
||||
* 纬度
|
||||
*/
|
||||
alarmDescription?: string;
|
||||
latitude?: number;
|
||||
|
||||
/**
|
||||
* 报警时间
|
||||
* 报警位置
|
||||
*/
|
||||
alarmTime?: string;
|
||||
location?: string;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
/**
|
||||
* 报警开始时间
|
||||
*/
|
||||
startTime?: string;
|
||||
|
||||
/**
|
||||
* 报警结束时间
|
||||
*/
|
||||
finishTime?: string;
|
||||
|
||||
/**
|
||||
* 报警持续时间
|
||||
*/
|
||||
durationTime?: string;
|
||||
|
||||
/**
|
||||
* 0已处理,1未处理
|
||||
*/
|
||||
treatmentState?: number;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user