diff --git a/apps/web-antd/src/api/sis/authGroup/model.d.ts b/apps/web-antd/src/api/sis/authGroup/model.d.ts index d9c1eacf..b60f3273 100644 --- a/apps/web-antd/src/api/sis/authGroup/model.d.ts +++ b/apps/web-antd/src/api/sis/authGroup/model.d.ts @@ -21,6 +21,16 @@ export interface AuthGroupVO { */ isEnable: boolean; + /** + * 设备id + */ + acIds?: string[] | number[]; + + /** + * 楼层id + */ + floorIds?: string[] | number[]; + } export interface AuthGroupForm extends BaseEntity { diff --git a/apps/web-antd/src/api/sis/deviceManage/model.d.ts b/apps/web-antd/src/api/sis/deviceManage/model.d.ts index 7f5e0160..10b2f34b 100644 --- a/apps/web-antd/src/api/sis/deviceManage/model.d.ts +++ b/apps/web-antd/src/api/sis/deviceManage/model.d.ts @@ -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 } diff --git a/apps/web-antd/src/api/sis/elevatorInfo/index.ts b/apps/web-antd/src/api/sis/elevatorInfo/index.ts index 490a32f1..9c846668 100644 --- a/apps/web-antd/src/api/sis/elevatorInfo/index.ts +++ b/apps/web-antd/src/api/sis/elevatorInfo/index.ts @@ -59,22 +59,3 @@ export function elevatorInfoUpdate(data: ElevatorInfoForm) { export function elevatorInfoRemove(elevatorId: ID | IDS) { return requestClient.deleteWithMsg(`/sis/elevatorInfo/${elevatorId}`); } - -/** - * 新增电梯⇄楼层关联 - * @param params - * @returns void - */ -export function refAdd(data: ElevatorFloorRefForm) { - return requestClient.postWithMsg('/sis/elevatorInfo/ref/add', data); -} - -/** - * 查询电梯⇄楼层关联 - * @param id - * @returns void - */ -export function refQuery(id: ID) { - return requestClient.get(`/sis/elevatorInfo/ref/${id}`); -} - diff --git a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue index b65cafe5..90976c79 100644 --- a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue +++ b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue @@ -1,26 +1,26 @@ diff --git a/apps/web-antd/src/views/sis/accessControl/device/data.ts b/apps/web-antd/src/views/sis/accessControl/device/data.ts index 038e3921..6704011c 100644 --- a/apps/web-antd/src/views/sis/accessControl/device/data.ts +++ b/apps/web-antd/src/views/sis/accessControl/device/data.ts @@ -25,9 +25,8 @@ export const querySchema: FormSchemaGetter = () => [ children: 'children', }, api: async () => { - const areaList = await communityTree(4); + const areaList = await communityTree(3); addFullName(areaList, 'label', '/'); - console.log(areaList); return areaList; }, }, diff --git a/apps/web-antd/src/views/sis/accessControl/device/index.vue b/apps/web-antd/src/views/sis/accessControl/device/index.vue index b59796bb..b9e199b0 100644 --- a/apps/web-antd/src/views/sis/accessControl/device/index.vue +++ b/apps/web-antd/src/views/sis/accessControl/device/index.vue @@ -1,26 +1,26 @@ @@ -136,49 +136,23 @@ function handleDownloadExcel() {