zhangchao/Visualize-electronic-fences
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 添加报警列表搜索

Browse Source
This commit is contained in:
Ironsp
2026-05-13 11:20:24 +08:00
parent 6e62bcd085
commit ce94dd756b
6 changed files with 232 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/views/equipmentList/list.vue
View File

@@ -14,7 +14,10 @@
<el-input v-model="queryParams.monitoringArea" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设备状态" prop="status">
<el-input v-model="queryParams.status" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable style="width: 160px">
<el-option label="在线" :value="1" />
<el-option label="离线" :value="2" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -32,7 +35,7 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd">添加设备</el-button>
</el-col>
<el-col :span="1.5">
<el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
<el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="multiple" @click="handleActivate()"
>批量唤醒</el-button
>
</el-col>
@@ -53,7 +56,13 @@
<el-table-column v-if="true" label="设备编号" align="center" prop="code" />
<el-table-column label="设备名称" align="center" prop="name" />
<el-table-column label="监控区域" align="center" prop="monitoringArea" />
<el-table-column label="设备状态" align="center" prop="status" />
<el-table-column label="设备状态" align="center" prop="status" width="100">
<template #default="scope">
<span v-if="scope.row.status === 1 || scope.row.status === '1'">在线</span>
<span v-else-if="scope.row.status === 2 || scope.row.status === '2'">离线</span>
<span v-else>{{ scope.row.status ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="设备型号" align="center" prop="model" />
<el-table-column label="固件版本" align="center" prop="id" />
<el-table-column label="是否绘制区域" align="center" prop="isDrawArea" />
@@ -61,10 +70,9 @@
<el-table-column width="400" label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="primary" @click="handleDelete(scope.row)">查看监控</el-button>
<el-button type="primary" @click="handleDelete(scope.row)">唤醒设备</el-button>
<el-button type="primary" @click="handleSee(scope.row)">查看监控</el-button>
<el-button type="primary" @click="handleActivate(scope.row)">唤醒设备</el-button>
<el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -73,7 +81,7 @@
</el-card>
<!-- 添加或修改测试单对话框 -->
<el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="demoFormRef" :model="form" :rules="rules" >
<el-form ref="demoFormRef" :model="form" :rules="rules">
<el-form-item label="设备编号：" prop="code">
<el-input v-model="form.code" placeholder="请输入设备编号" />
</el-form-item>
@@ -107,7 +115,6 @@ const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
@@ -123,7 +130,7 @@ const initFormData = {
id: undefined,
code: undefined,
name: undefined,
monitoringArea: undefined,
monitoringArea: undefined
};
const data = reactive({
form: { ...initFormData },
@@ -180,7 +187,6 @@ const resetQuery = () => {
/** 多选框选中数据 */
const handleSelectionChange = (selection: any) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
@@ -218,6 +224,31 @@ const submitForm = () => {
});
};
/** 唤醒设备（单行传 row，批量不传则使用表格勾选 ids，调用 actDevice） */
const handleActivate = async (row?: any) => {
const targetIds = row?.id != null ? row.id : ids.value;
const isBatch = row == null;
if (isBatch && (!Array.isArray(targetIds) || !targetIds.length)) {
proxy?.$modal.msgWarning('请先勾选要唤醒的设备');
return;
}
const msg = isBatch ? `是否确认批量唤醒已选中的 ${targetIds.length} 台设备？` : `是否确认唤醒设备「${row!.name ?? row!.code ?? row!.id}」？`;
await proxy?.$modal.confirm(msg);
loading.value = true;
try {
await actDevice(targetIds);
proxy?.$modal.msgSuccess('唤醒成功');
await getList();
} finally {
loading.value = false;
}
};
/* 查看监控 */
const handleSee = (row?: any) => {
alert('查看监控');
};
/** 删除按钮操作 */
const handleDelete = async (row?: DemoVO) => {
const _ids = row?.id || ids.value;