|
|
@@ -314,7 +314,26 @@ const rules: FormRules = {
|
|
|
async function getList() {
|
|
|
loading.value = true
|
|
|
try {
|
|
|
- const res = await listMachines({ page: currentPage.value, pageSize: pageSize.value })
|
|
|
+ // 构建查询参数
|
|
|
+ const params: Record<string, any> = {
|
|
|
+ page: currentPage.value,
|
|
|
+ size: pageSize.value
|
|
|
+ }
|
|
|
+ // 搜索关键词(机器ID或名称)
|
|
|
+ if (searchForm.machineId || searchForm.name) {
|
|
|
+ params.keyword = searchForm.machineId || searchForm.name
|
|
|
+ }
|
|
|
+ // 启用状态过滤
|
|
|
+ if (searchForm.enabled !== '') {
|
|
|
+ params.enabled = searchForm.enabled
|
|
|
+ }
|
|
|
+ // 排序
|
|
|
+ if (sortState.prop && sortState.order) {
|
|
|
+ params.sortBy = sortState.prop
|
|
|
+ params.sortDir = sortState.order === 'ascending' ? 'ASC' : 'DESC'
|
|
|
+ }
|
|
|
+
|
|
|
+ const res = await listMachines(params)
|
|
|
if (res.success) {
|
|
|
machineList.value = res.data.list
|
|
|
total.value = res.data.total || 0
|
|
|
@@ -338,12 +357,14 @@ function handleReset() {
|
|
|
// 重置排序
|
|
|
sortState.prop = ''
|
|
|
sortState.order = null
|
|
|
+ getList()
|
|
|
}
|
|
|
|
|
|
// 排序变化处理
|
|
|
function handleSortChange({ prop, order }: { prop: string; order: 'ascending' | 'descending' | null }) {
|
|
|
sortState.prop = prop || ''
|
|
|
sortState.order = order
|
|
|
+ getList()
|
|
|
}
|
|
|
|
|
|
// 选择变化处理
|