diff --git a/src/views/menuData/AlertDialog.vue b/src/views/menuData/AlertDialog.vue index 61854dc..f8450ac 100644 --- a/src/views/menuData/AlertDialog.vue +++ b/src/views/menuData/AlertDialog.vue @@ -145,8 +145,8 @@ export default { tableData: [], coloumData: [ { - label: "防区名称", - prop: "positionName", + label: "事件类型", + prop: "flyStatus", align: "center" }, { @@ -236,14 +236,24 @@ export default { alarmList(params).then((res) => { if (res.code === 0) { this.tableData = res.data.items.map((item) => { - const { isWhitelist, duration, frequency, ...rest } = item; + const { isWhitelist, duration, frequency, alarmLevel, ...rest } = + item; + + let flyStatus = ""; + if (isWhitelist) { + flyStatus = "白飞"; + } else { + flyStatus = alarmLevel === 0 ? "防区外" : "入侵"; + } return { ...rest, - isattacked: item.isattacked ? "是" : "否", + isattacked: item.isattacked ? "是" : "否", // 保留你原本的逻辑 duration: String(item.duration), - frequency: String(item.frequency) + frequency: String(item.frequency), + flyStatus // 新增字段 }; }); + this.paginationParam.total = res.data.total; } });