diff --git a/src/api/types/ReactorType.ts b/src/api/types/ReactorType.ts index 2b71745..a0de90c 100644 --- a/src/api/types/ReactorType.ts +++ b/src/api/types/ReactorType.ts @@ -20,31 +20,13 @@ export enum MaintenanceFlagEnum { // 过滤条件 export interface ReactorFilter { /** 设备编号 */ - deviceNo?: string | null - /** 资产编号 */ - assetNo?: string | null - /** 产品ID */ - productID?: string | null - /** 型号 */ - model?: string | null - /** 规格 */ - specification?: string | null - /** 房间ID */ - roomID?: number | null - /** 负责人ID */ - principalId?: number | null - /** 设备状态 */ - deviceStatus?: DeviceStatusEnum | null - /** 维护标志 */ - maintenanceFlag?: MaintenanceFlagEnum | null - /** 状态 */ - status?: boolean | null - /** 是否维护中 */ - isMaintenance?: boolean | null + keyWord?: string | null /** 开始时间 */ - startTime?: string | null + stDate?: string | null /** 结束时间 */ - endTime?: string | null + edDate?: string | null + /** 房间ID */ + roomId?: number | null } // 反应器DTO diff --git a/src/views/admin/reactor/index.vue b/src/views/admin/reactor/index.vue index 66047b2..d61cb56 100644 --- a/src/views/admin/reactor/index.vue +++ b/src/views/admin/reactor/index.vue @@ -3,11 +3,11 @@ - - - + + @@ -102,14 +102,7 @@ const state = reactive({ keyWord: '', stDate: '', edDate: '', - deviceStatus: undefined as number | undefined, - maintenanceFlag: undefined as number | undefined, - principalId: undefined as number | undefined, - roomID: undefined as number | undefined, - status: undefined as number | undefined, - isMaintenance: undefined as boolean | undefined, - pageIndex: 1, - pageSize: 10 + roomId: undefined as number | undefined }, pageInput: { currentPage: 1, @@ -126,12 +119,11 @@ const state = reactive({ /** 查询列表 */ const getList = async () => { loading.value = true - state.filter.pageIndex = state.pageInput.currentPage ?? 1 - state.filter.pageSize = state.pageInput.pageSize ?? 20 + state.pageInput.filter = state.filter try { console.log(state.filter); - const res = await new ReactorApi().getPage(state.filter) + const res = await new ReactorApi().getPage(state.pageInput) state.reactorList = res.data?.list || [] state.total = res.data?.total || 0 } catch (error) {