diff --git a/src/components/device/device-tree/device-tree.vue b/src/components/device/device-tree/device-tree.vue
index 0686a64..a546100 100644
--- a/src/components/device/device-tree/device-tree.vue
+++ b/src/components/device/device-tree/device-tree.vue
@@ -4,7 +4,6 @@ import { useDeviceTree } from '@/composables';
 import { DEVICE_TYPE_NAMES, DEVICE_TYPE_LITERALS, tryGetDeviceType, type DeviceType } from '@/enums';
 import { isNvrCluster } from '@/helpers';
 import { useDeviceStore, useStationStore } from '@/stores';
-import { sleep } from '@/utils';
 import { watchImmediate } from '@vueuse/core';
 import destr from 'destr';
 import { isFunction } from 'es-toolkit';
@@ -28,7 +27,7 @@ import {
   type TreeProps,
 } from 'naive-ui';
 import { storeToRefs } from 'pinia';
-import { computed, h, onBeforeUnmount, ref, toRefs, useTemplateRef, watch, type CSSProperties } from 'vue';
+import { computed, h, nextTick, onBeforeUnmount, ref, toRefs, useTemplateRef, watch, type CSSProperties } from 'vue';
 
 const props = defineProps<{
   station?: Station; // 支持渲染指定车站的设备树
@@ -325,7 +324,7 @@ const lineDeviceTreeData = computed<Record<Station['code'], TreeOption[]>>(() =>
             const device = dev as NdmDeviceResultVO;
             return {
               label: `${device.name}`,
-              key: device.id ?? `${device.name}`,
+              key: `${device.id}`,
               prefix: () => renderDeviceNodePrefix(device, stationCode),
               suffix: () => `${device.ipAddress}`,
               // 当选择设备时，能获取到设备的所有信息，以及设备所属的车站
@@ -359,13 +358,13 @@ const stationDeviceTreeData = computed<TreeOption[]>(() => {
         children: clusters.map<TreeOption>((device) => {
           return {
             label: `${device.name}`,
-            key: device.id ?? `${device.name}`,
+            key: `${device.id}`,
             prefix: () => renderDeviceNodePrefix(device, stationCode),
             suffix: () => `${device.ipAddress}`,
             children: singletons.map<TreeOption>((device) => {
               return {
                 label: `${device.name}`,
-                key: device.id ?? `${device.name}`,
+                key: `${device.id}`,
                 prefix: () => renderDeviceNodePrefix(device, stationCode),
                 suffix: () => `${device.ipAddress}`,
                 stationCode,
@@ -387,7 +386,7 @@ const stationDeviceTreeData = computed<TreeOption[]>(() => {
       children: stationDevices[deviceType].map<TreeOption>((device) => {
         return {
           label: `${device.name}`,
-          key: device.id ?? `${device.name}`,
+          key: `${device.id}`,
           prefix: () => renderDeviceNodePrefix(device, stationCode),
           suffix: () => `${device.ipAddress}`,
           stationCode,
@@ -421,39 +420,46 @@ const searchFilter = (pattern: string, node: TreeOption): boolean => {
 };
 
 // ========== 设备树交互 ==========
-const expandedKeys = ref<string[]>();
+const animated = ref(true);
+const expandedKeys = ref<string[]>([]);
 const deviceTreeInst = useTemplateRef<TreeInst>('deviceTreeInst');
 const onFoldDeviceTree = () => {
   expandedKeys.value = [];
 };
-const onLocateDeviceTree = () => {
-  const stationCode = selectedStationCode.value;
-  const device = selectedDevice.value;
-  if (!stationCode || !device?.id) return;
-  const deviceTypeVal = tryGetDeviceType(device.deviceType);
-  if (!!deviceTypeVal) {
-    activeTab.value = deviceTypeVal;
-  }
+const onLocateDeviceTree = async () => {
+  if (!selectedStationCode.value) return;
+  if (!selectedDevice.value) return;
+  const deviceType = tryGetDeviceType(selectedDevice.value.deviceType);
+  if (!deviceType) return;
+  if (!deviceTreeInst.value) return;
 
-  const expanded = [stationCode];
-  if (activeTab.value === DEVICE_TYPE_LITERALS.ndmNvr) {
-    const nvrs = lineDevices.value[stationCode]?.[DEVICE_TYPE_LITERALS.ndmNvr];
-    if (nvrs) {
-      const clusterKeys = nvrs.filter((nvr) => !!nvr.clusterList?.trim() && nvr.clusterList !== nvr.ipAddress).map((nvr) => String(nvr.id));
-      expanded.push(...clusterKeys);
+  animated.value = false;
+
+  // 定位设备类型
+  activeTab.value = deviceType;
+
+  // 展开选择的车站
+  expandedKeys.value = [selectedStationCode.value];
+
+  // 当选择录像机时，如果不是集群，进一步展开该录像机所在的集群节点
+  if (deviceType === DEVICE_TYPE_LITERALS.ndmNvr) {
+    const stationDevices = lineDevices.value[selectedStationCode.value];
+    if (stationDevices) {
+      const selectedNvr = selectedDevice.value as NdmNvrResultVO;
+      if (!isNvrCluster(selectedNvr)) {
+        const nvrs = stationDevices[DEVICE_TYPE_LITERALS.ndmNvr];
+        const clusters = nvrs.filter((nvr) => isNvrCluster(nvr) && nvr.clusterList?.includes(selectedNvr.clusterList ?? ''));
+        expandedKeys.value.push(...clusters.map((nvr) => `${nvr.id}`));
+      }
     }
   }
-  expandedKeys.value = expanded;
 
-  // 由于数据量大所以开启虚拟滚动，
-  // 但是无法知晓NTree内部的虚拟列表容器何时创建完成，所以使用setTimeout延迟固定时间后执行滚动
-  scrollDeviceTreeToSelectedDevice();
+  // 等待设备树展开完成，滚动到选择的设备
+  await nextTick();
+  deviceTreeInst.value.scrollTo({ key: `${selectedDevice.value.id}`, behavior: 'smooth' });
+
+  animated.value = true;
 };
-async function scrollDeviceTreeToSelectedDevice() {
-  await sleep(350);
-  const inst = deviceTreeInst.value;
-  inst?.scrollTo({ key: selectedDevice?.value?.id ?? `${selectedDevice.value?.name}`, behavior: 'smooth' });
-}
 </script>
 
 <template>
@@ -483,7 +489,7 @@ async function scrollDeviceTreeToSelectedDevice() {
     >
       <template v-if="!station">
         <div style="height: 100%; flex: 0 0 auto">
-          <NTabs v-model:value="activeTab" animated type="line" placement="left" style="height: 100%">
+          <NTabs v-model:value="activeTab" type="line" placement="left" style="height: 100%">
             <NTab v-for="pane in deviceTabPanes" :key="pane.name" :name="pane.name" :tab="pane.tab"></NTab>
           </NTabs>
         </div>
@@ -496,6 +502,7 @@ async function scrollDeviceTreeToSelectedDevice() {
             show-line
             virtual-scroll
             :ref="'deviceTreeInst'"
+            :animated="animated"
             :selected-keys="selectedKeys"
             :data="lineDeviceTreeData[activeTab]"
             :show-irrelevant-nodes="false"
@@ -515,6 +522,7 @@ async function scrollDeviceTreeToSelectedDevice() {
           show-line
           virtual-scroll
           :data="stationDeviceTreeData"
+          :animated="animated"
           :show-irrelevant-nodes="false"
           :pattern="searchPattern"
           :filter="searchFilter"