diff --git a/src/components/offline-device-detail-modal.vue b/src/components/offline-device-detail-modal.vue
index a53aa8f..a9c7889 100644
--- a/src/components/offline-device-detail-modal.vue
+++ b/src/components/offline-device-detail-modal.vue
@@ -35,8 +35,8 @@ watch(show, (newValue) => {
 const searchPattern = ref('');
 const searchFilter: (pattern: string, node: TreeOption) => boolean = (pattern, node) => {
   const device = node['device'] as NdmDeviceVO | undefined;
-  const { name, ipAddress } = device ?? {};
-  return (name ?? '').includes(pattern) || (ipAddress ?? '').includes(pattern);
+  const { name, ipAddress, deviceId } = device ?? {};
+  return (name ?? '').includes(pattern) || (ipAddress ?? '').includes(pattern) || (deviceId ?? '').includes(pattern);
 };
 
 const offlineDeviceCount = computed(() => {
@@ -107,7 +107,7 @@ const onModalClose = () => {
       <span>当前没有离线设备</span>
     </div>
     <template v-else>
-      <NInput v-model:value="searchPattern" placeholder="搜索设备名称或IP地址" clearable />
+      <NInput v-model:value="searchPattern" placeholder="搜索设备名称、设备ID或IP地址" clearable />
       <NTree
         :data="treeData"
         :override-default-node-click-behavior="override"
diff --git a/src/pages/device-page.vue b/src/pages/device-page.vue
index 9e667a9..dc7dbc6 100644
--- a/src/pages/device-page.vue
+++ b/src/pages/device-page.vue
@@ -210,14 +210,13 @@ const searchPattern = computed(() => {
 const searchFilter = (pattern: string, node: TreeOption): boolean => {
   const { search, status } = destr<{ search: string; status: string }>(pattern);
   const device = node['device'] as NdmDeviceResultVO | undefined;
-  const { name, ipAddress, deviceStatus } = device ?? {};
-  const searchMatched = (name ?? '').includes(search) || (ipAddress ?? '').includes(search);
+  const { name, ipAddress, deviceId, deviceStatus } = device ?? {};
+  const searchMatched = (name ?? '').includes(search) || (ipAddress ?? '').includes(search) || (deviceId ?? '').includes(search);
   const statusMatched = status === '' || status === deviceStatus;
   return searchMatched && statusMatched;
 };
 
 // ========== 设备树交互 ==========
-// 将多实例改为单实例，便于直接获取 Tree 实例
 const deviceTreeInst = useTemplateRef<TreeInst>('deviceTreeInst');
 const onClickLocateDeviceTree = () => {
   selectedTab.value = (selectedDevice.value?.deviceType ?? selectedTab.value) as DeviceTypeCode;
@@ -249,7 +248,7 @@ const scrollDeviceTreeToSelectedDevice = (timeout: number = 500) => {
     <NLayoutSider bordered :width="600" :collapsed-width="0" show-trigger="bar">
       <div style="height: 100%; display: flex; flex-direction: column">
         <div style="flex-shrink: 0; padding: 12px">
-          <NInput v-model:value="searchInput" placeholder="搜索设备名称或IP地址" clearable />
+          <NInput v-model:value="searchInput" placeholder="搜索设备名称、设备ID或IP地址" clearable />
           <NFlex justify="space-between" align="center">
             <NRadioGroup v-model:value="statusInput">
               <NRadio value="">全部</NRadio>