Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -42,6 +42,14 @@ export function applicationAdd(data: ApplicationForm) {
|
||||
return requestClient.postWithMsg<void>('/property/application', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 领用审核
|
||||
* @param data
|
||||
*/
|
||||
export function applicationVerified(data: ApplicationForm) {
|
||||
return requestClient.postWithMsg<void>('/property/application/verified', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新资产领用
|
||||
* @param data
|
||||
|
@@ -7,21 +7,20 @@ import { commonExport } from '#/api/helper';
|
||||
import { requestClient } from '#/api/request';
|
||||
|
||||
/**
|
||||
* 查询排班列表
|
||||
* 分页查询排班列表
|
||||
* @param params
|
||||
* @returns 排班列表
|
||||
*/
|
||||
export function arrangementList(params?: ArrangementQuery) {
|
||||
return requestClient.get<PageResult<ArrangementVO>>('/property/arrangement/list', { params });
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出排班列表
|
||||
* 根据月份查询排班列表
|
||||
* @param params
|
||||
* @returns 排班列表
|
||||
*/
|
||||
export function arrangementExport(params?: ArrangementQuery) {
|
||||
return commonExport('/property/arrangement/export', params ?? {});
|
||||
export function arrangementCalender(params?: ArrangementQuery) {
|
||||
return requestClient.get<any>('/property/arrangement/explore', { params });
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -40,7 +40,6 @@ export interface ArrangementVO {
|
||||
* 状态:0-未生效,1-已生效
|
||||
*/
|
||||
status: number;
|
||||
|
||||
}
|
||||
|
||||
export interface ArrangementForm extends BaseEntity {
|
||||
@@ -83,7 +82,10 @@ export interface ArrangementForm extends BaseEntity {
|
||||
* 状态:0-未生效,1-已生效
|
||||
*/
|
||||
status?: number;
|
||||
|
||||
/**
|
||||
* 排班人员详情
|
||||
*/
|
||||
userGroupList: any[];
|
||||
}
|
||||
|
||||
export interface ArrangementQuery extends PageQuery {
|
||||
@@ -123,7 +125,12 @@ export interface ArrangementQuery extends PageQuery {
|
||||
status?: number;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
|
||||
/**
|
||||
* 月份
|
||||
*/
|
||||
month?: string;
|
||||
}
|
||||
|
@@ -12,6 +12,22 @@ import { requestClient } from '#/api/request';
|
||||
export function workOrdersTypeList(params?: WorkOrdersTypeQuery) {
|
||||
return requestClient.get<PageResult<WorkOrdersTypeVO>>('/property/workOrdersType/list', { params });
|
||||
}
|
||||
/**
|
||||
* 查询工单类型不分页
|
||||
* @param params
|
||||
* @returns 工单类型管理列表
|
||||
*/
|
||||
export function workOrdersTypeListAll(params?: WorkOrdersTypeQuery) {
|
||||
return requestClient.get<WorkOrdersTypeVO[]>('/property/workOrdersType/queryList', { params });
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工单类型树结构
|
||||
* @param params
|
||||
*/
|
||||
export function workOrdersTypeTree(params?: WorkOrdersTypeQuery) {
|
||||
return requestClient.get<WorkOrdersTypeVO[]>('/property/workOrdersType/typeTree', { params });
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工单类型管理列表
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import type { PageQuery, BaseEntity } from '#/api/common';
|
||||
import type {PageQuery, BaseEntity} from '#/api/common';
|
||||
|
||||
export interface WorkOrdersTypeVO {
|
||||
/**
|
||||
@@ -34,7 +34,9 @@ export interface WorkOrdersTypeVO {
|
||||
/**
|
||||
* 是否支持转单(0支持,1不支持)
|
||||
*/
|
||||
isTransfers: number;
|
||||
isTransfers: string;
|
||||
|
||||
excludeId: string;
|
||||
}
|
||||
|
||||
export interface WorkOrdersTypeForm extends BaseEntity {
|
||||
@@ -72,6 +74,11 @@ export interface WorkOrdersTypeForm extends BaseEntity {
|
||||
* 是否支持转单(0支持,1不支持)
|
||||
*/
|
||||
isTransfers?: number;
|
||||
|
||||
/**
|
||||
* 上级类型id
|
||||
*/
|
||||
parentId?: string;
|
||||
}
|
||||
|
||||
export interface WorkOrdersTypeQuery extends PageQuery {
|
||||
@@ -106,7 +113,12 @@ export interface WorkOrdersTypeQuery extends PageQuery {
|
||||
isTransfers?: number;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
|
||||
/**
|
||||
* 是否过滤子级
|
||||
*/
|
||||
filterSubNodes?: boolean;
|
||||
}
|
||||
|
10
apps/web-antd/src/api/sis/authGroup/model.d.ts
vendored
10
apps/web-antd/src/api/sis/authGroup/model.d.ts
vendored
@@ -21,6 +21,16 @@ export interface AuthGroupVO {
|
||||
*/
|
||||
isEnable: boolean;
|
||||
|
||||
/**
|
||||
* 设备id
|
||||
*/
|
||||
acIds?: string[] | number[];
|
||||
|
||||
/**
|
||||
* 楼层id
|
||||
*/
|
||||
floorIds?: string[] | number[];
|
||||
|
||||
}
|
||||
|
||||
export interface AuthGroupForm extends BaseEntity {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import type { PageQuery, BaseEntity } from '#/api/common';
|
||||
import type { BaseEntity, PageQuery } from '#/api/common';
|
||||
|
||||
export interface DeviceChannelVO {
|
||||
/**
|
||||
@@ -51,6 +51,13 @@ export interface DeviceChannelVO {
|
||||
*/
|
||||
channelNo: string;
|
||||
|
||||
nvrId: string;
|
||||
nvrFactoryNo: string;
|
||||
nvrIp: string;
|
||||
nvrPort: number;
|
||||
nvrAccount: string;
|
||||
nvrPwd: string;
|
||||
nvrChannelNo: string;
|
||||
}
|
||||
|
||||
export interface DeviceChannelForm extends BaseEntity {
|
||||
@@ -103,7 +110,6 @@ export interface DeviceChannelForm extends BaseEntity {
|
||||
* 设备通道编号
|
||||
*/
|
||||
channelNo?: string;
|
||||
|
||||
}
|
||||
|
||||
export interface DeviceChannelQuery extends PageQuery {
|
||||
@@ -153,7 +159,7 @@ export interface DeviceChannelQuery extends PageQuery {
|
||||
channelNo?: string;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
}
|
||||
|
@@ -1,177 +1,182 @@
|
||||
import type { BaseEntity, PageQuery } from '#/api/common';
|
||||
import type { BaseEntity, PageQuery } from '#/api/common'
|
||||
|
||||
export interface DeviceManageVO {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
id: string | number;
|
||||
id: string | number
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
deviceNo: string;
|
||||
deviceNo: string
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
deviceName: string;
|
||||
deviceName: string
|
||||
|
||||
/**
|
||||
* 设备ip
|
||||
*/
|
||||
deviceIp: string;
|
||||
deviceIp: string
|
||||
|
||||
/**
|
||||
* 设备端口
|
||||
*/
|
||||
devicePort: number;
|
||||
devicePort: number
|
||||
|
||||
/**
|
||||
* 设备账号
|
||||
*/
|
||||
deviceAccount: string;
|
||||
deviceAccount: string
|
||||
|
||||
/**
|
||||
* 设备密码
|
||||
*/
|
||||
devicePwd: string;
|
||||
devicePwd: string
|
||||
|
||||
/**
|
||||
* 设备
|
||||
*/
|
||||
deviceMac: string;
|
||||
deviceMac: string
|
||||
|
||||
/**
|
||||
* 设备在线状态 0:离线 1:在线 2:未知
|
||||
*/
|
||||
deviceStatus: number;
|
||||
deviceStatus: number
|
||||
|
||||
/**
|
||||
* 父级设备id
|
||||
*/
|
||||
parentId: string | number;
|
||||
parentId: string | number
|
||||
|
||||
/**
|
||||
* 设备通道编号
|
||||
*/
|
||||
channelNo: string;
|
||||
channelNo: string
|
||||
|
||||
/**
|
||||
* 录像机ip
|
||||
*/
|
||||
vcrIp: string;
|
||||
vcrIp: string
|
||||
|
||||
/**
|
||||
* 录像机端口
|
||||
*/
|
||||
vcrPort: number;
|
||||
vcrPort: number
|
||||
|
||||
/**
|
||||
* 录像机账号
|
||||
*/
|
||||
vcrAccount: string;
|
||||
vcrAccount: string
|
||||
|
||||
/**
|
||||
* 录像机密码
|
||||
*/
|
||||
vcrPwd: string;
|
||||
vcrPwd: string
|
||||
|
||||
/**
|
||||
* 门禁id
|
||||
*/
|
||||
accessControlId: string | number;
|
||||
accessControlId: string | number
|
||||
|
||||
/**
|
||||
* 楼层id
|
||||
*/
|
||||
floorId: string | number
|
||||
}
|
||||
|
||||
export interface DeviceManageForm extends BaseEntity {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
id?: string | number;
|
||||
id?: string | number
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
deviceNo?: string;
|
||||
deviceNo?: string
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
deviceName?: string;
|
||||
deviceName?: string
|
||||
|
||||
/**
|
||||
* 设备ip
|
||||
*/
|
||||
deviceIp?: string;
|
||||
deviceIp?: string
|
||||
|
||||
/**
|
||||
* 设备端口
|
||||
*/
|
||||
devicePort?: number;
|
||||
devicePort?: number
|
||||
|
||||
/**
|
||||
* 设备账号
|
||||
*/
|
||||
deviceAccount?: string;
|
||||
deviceAccount?: string
|
||||
|
||||
/**
|
||||
* 设备密码
|
||||
*/
|
||||
devicePwd?: string;
|
||||
devicePwd?: string
|
||||
|
||||
/**
|
||||
* 设备
|
||||
*/
|
||||
deviceMac?: string;
|
||||
deviceMac?: string
|
||||
|
||||
/**
|
||||
* 设备在线状态 0:离线 1:在线 2:未知
|
||||
*/
|
||||
deviceStatus?: number;
|
||||
deviceStatus?: number
|
||||
}
|
||||
|
||||
export interface DeviceManageQuery extends PageQuery {
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
deviceNo?: string;
|
||||
deviceNo?: string
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
deviceName?: string;
|
||||
deviceName?: string
|
||||
|
||||
/**
|
||||
* 设备ip
|
||||
*/
|
||||
deviceIp?: string;
|
||||
deviceIp?: string
|
||||
|
||||
/**
|
||||
* 设备端口
|
||||
*/
|
||||
devicePort?: number;
|
||||
devicePort?: number
|
||||
|
||||
/**
|
||||
* 设备账号
|
||||
*/
|
||||
deviceAccount?: string;
|
||||
deviceAccount?: string
|
||||
|
||||
/**
|
||||
* 设备密码
|
||||
*/
|
||||
devicePwd?: string;
|
||||
devicePwd?: string
|
||||
|
||||
/**
|
||||
* 设备
|
||||
*/
|
||||
deviceMac?: string;
|
||||
deviceMac?: string
|
||||
|
||||
/**
|
||||
* 设备在线状态 0:离线 1:在线 2:未知
|
||||
*/
|
||||
deviceStatus?: number;
|
||||
deviceStatus?: number
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
params?: any
|
||||
}
|
||||
|
@@ -59,22 +59,3 @@ export function elevatorInfoUpdate(data: ElevatorInfoForm) {
|
||||
export function elevatorInfoRemove(elevatorId: ID | IDS) {
|
||||
return requestClient.deleteWithMsg<void>(`/sis/elevatorInfo/${elevatorId}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增电梯⇄楼层关联
|
||||
* @param params
|
||||
* @returns void
|
||||
*/
|
||||
export function refAdd(data: ElevatorFloorRefForm) {
|
||||
return requestClient.postWithMsg<void>('/sis/elevatorInfo/ref/add', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询电梯⇄楼层关联
|
||||
* @param id
|
||||
* @returns void
|
||||
*/
|
||||
export function refQuery(id: ID) {
|
||||
return requestClient.get<ElevatorFloorRefVo[]>(`/sis/elevatorInfo/ref/${id}`);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user