diff --git a/netx_api/main.py b/netx_api/main.py index 6859222..546d370 100644 --- a/netx_api/main.py +++ b/netx_api/main.py @@ -653,6 +653,7 @@ def ume_list_alarms( severity: str | None = Query(default=None), is_cleared: str | None = Query(default=None), ne_id: str | None = Query(default=None), + host_name: str | None = Query(default=None), keyword: str | None = Query(default=None), page: int = Query(default=1, ge=1), page_size: int = Query(default=50, ge=1, le=500), @@ -667,6 +668,9 @@ def ume_list_alarms( stmt = stmt.filter(UmeAlarmCurrent.is_cleared == str(is_cleared).strip()) if ne_id and str(ne_id).strip(): stmt = stmt.filter(UmeAlarmCurrent.ne_id == str(ne_id).strip()) + hn = str(host_name or "").strip() + if hn: + stmt = stmt.filter(UmeInventoryNE.host_name.contains(hn)) kw = str(keyword or "").strip() if kw: stmt = stmt.filter( diff --git a/web/src/pages/UmePage.tsx b/web/src/pages/UmePage.tsx index 0ecdac5..89328bc 100644 --- a/web/src/pages/UmePage.tsx +++ b/web/src/pages/UmePage.tsx @@ -23,7 +23,7 @@ export function UmePage() { const [curSeverity, setCurSeverity] = useState(""); const [curCleared, setCurCleared] = useState(""); - const [curNeId, setCurNeId] = useState(""); + const [curHostName, setCurHostName] = useState(""); const [curKeyword, setCurKeyword] = useState(""); const [curPage, setCurPage] = useState(1); const [curPageSize, setCurPageSize] = useState(50); @@ -92,12 +92,12 @@ export function UmePage() { staleTime: 5000, }); const currentQuery = useQuery({ - queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curNeId, curKeyword, curPage, curPageSize], + queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curHostName, curKeyword, curPage, curPageSize], queryFn: () => fetchUmeCurrentAlarms({ severity: curSeverity, isCleared: curCleared, - neId: curNeId, + hostName: curHostName, keyword: curKeyword, page: curPage, pageSize: curPageSize, @@ -419,7 +419,7 @@ export function UmePage() { placeholder="keyword(告警键/原因/ne_name/host_name/ip 等)" onChange={(e) => setCurKeyword(e.target.value)} /> - setCurNeId(e.target.value)} /> + setCurHostName(e.target.value)} /> @@ -464,19 +464,27 @@ export function UmePage() {