WuXi/NPP_Vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修复一些自测bug

Browse Source
This commit is contained in:
Asoka.Wang 2025-06-16 12:52:13 +08:00
parent 8d95ef8628
commit adb93ecad5
2 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/types/ReactorType.ts
View File

@ -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

20
src/views/admin/reactor/index.vue
View File

@ -3,11 +3,11 @@
<el-card class="my-query-box mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
<el-form :inline="true" label-width="auto" :label-position="'left'" @submit.stop.prevent>
<el-form-item label="关键字" prop="keyWord">
<el-input v-model="state.filter.keyWord" placeholder="请输入设备编号/资产编号/产品ID/型号" clearable style="width: 300px"
<el-input v-model="state.filter.keyWord" placeholder="请输入设备编号/资产编号" clearable style="width: 300px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="房间" prop="roomID">
<el-select v-model="state.filter.roomID" placeholder="请选择房间" clearable style="width: 200px">
<el-form-item label="房间" prop="roomId">
<el-select v-model="state.filter.roomId" placeholder="请选择房间" clearable style="width: 200px">
<el-option v-for="item in state.roomOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -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) {