diff --git a/web/src/stores/los.ts b/web/src/stores/log.ts
similarity index 72%
rename from web/src/stores/los.ts
rename to web/src/stores/log.ts
index b18bb92005fcbed5768147b408dfb36dce8849b4..40b440e2066aefd845a53db64f5e554bf2027db2 100644
--- a/web/src/stores/los.ts
+++ b/web/src/stores/log.ts
@@ -1,17 +1,15 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-interface LogSearchObj {
+interface LogSearchList {
+    ip:string,
     timeRange:[Date,Date];
     level:string;
-    service:{label:string,value:string;}
-}
-interface LogSearchList {
-    ip:string;
-    search_obj:LogSearchObj;
+    service:{label:string,value:string};
+    realTime:boolean;
 }
 export const useLogStore = defineStore('log', () => {
   const search_list = ref([] as LogSearchList[]);
-
+  const ws_isOpen = ref(false);
   const updateLogList = (param:any) => {
     let ip_index = search_list.value.findIndex(item => item.ip === param.ip);
     ip_index !== -1 ? search_list.value[ip_index] = param : search_list.value.push(param);
@@ -19,6 +17,7 @@ export const useLogStore = defineStore('log', () => {
 
   const $reset = () => {
     search_list.value = [];
+    ws_isOpen.value = false;
   }
-  return {search_list,updateLogList,$reset}
+  return {ws_isOpen,search_list,updateLogList,$reset}
 })
\ No newline at end of file
diff --git a/web/src/utils/socket.ts b/web/src/utils/socket.ts
index 080d74f2ee6848111a456afceea291339d9346b6..bab31c627933fce6e54ef8baeb8a3e4fa844ae0f 100644
--- a/web/src/utils/socket.ts
+++ b/web/src/utils/socket.ts
@@ -1,3 +1,4 @@
+import { useLogStore } from '@/stores/log'
 import { ElMessage } from 'element-plus'
 interface socket {
   websocket: any
@@ -18,10 +19,9 @@ interface socket {
   close: () => void
   reconnect: () => void
 }
-
 const socket: socket = {
   websocket: null,
-  connectURL: `wss://10.41.107.29:8888/plugin/ws/logs?clientId=${parseInt(Math.random() * 1000 + '')}`, 
+  connectURL: `wss://10.41.107.29:8888/plugin/ws/logs`, 
   // 开启标识
   socket_open: false,
   // 心跳timer
@@ -50,8 +50,8 @@ const socket: socket = {
     /* if (socket.websocket) {
       return socket.websocket
     } */
-
-    socket.websocket = new WebSocket(socket.connectURL)
+      let random = parseInt(Math.random() * 100000+'');
+    socket.websocket = new WebSocket(socket.connectURL+`?clientId=${random}`)
     socket.websocket.onmessage = (e: any) => {
       if (receiveMessage) {
         receiveMessage(e)
@@ -60,6 +60,7 @@ const socket: socket = {
 
     socket.websocket.onclose = (e: any) => {
       console.log('检测到关闭',e)
+      useLogStore().ws_isOpen = false;
       clearInterval(socket.hearbeat_interval)
       socket.socket_open = false
 
@@ -84,6 +85,7 @@ const socket: socket = {
     // 连接成功
     socket.websocket.onopen = function () {
       console.log('ws连接成功')
+      useLogStore().ws_isOpen = true;
       socket.socket_open = true
       socket.is_reonnect = false
       // 开启心跳
@@ -93,6 +95,7 @@ const socket: socket = {
     // 连接发生错误
     socket.websocket.onerror = function (e:any) {
       console.log('连接发生错误',e)
+      useLogStore().ws_isOpen = false;
     }
   },
 
@@ -141,7 +144,6 @@ const socket: socket = {
   },
 
   close: () => {
-    console.log('关闭ws')
     clearInterval(socket.hearbeat_interval)
     socket.is_reonnect = false
     socket.websocket.close()
diff --git a/web/src/views/TopoDisplay.vue b/web/src/views/TopoDisplay.vue
index b21951700964212241b0ead62efc30d47800e00f..3f3b883aebcd9f3dd7cd699479b68efadcc7d24d 100644
--- a/web/src/views/TopoDisplay.vue
+++ b/web/src/views/TopoDisplay.vue
@@ -39,7 +39,7 @@
     <el-dialog
       v-model="dialog"
       :title="title"
-      width="80%"
+      width="86%"
       @close="closeDialog"
       destroy-on-close
     >
@@ -77,7 +77,7 @@ import { useConfigStore } from "@/stores/config";
 import router from "@/router";
 import socket from "@/utils/socket";
 import { formatDate } from "@/utils/dateFormat";
-import { useLogStore } from "@/stores/los";
+import { useLogStore } from "@/stores/log";
 
 const graphMode = ref("default");
 const timeInterval = ref("关闭");
@@ -305,18 +305,16 @@ interface logItem {
 const serviceList = ref([] as any);
 const pluginlog_stream = ref([] as logItem[]);
 const pluginlog_total = ref(0);
-const getPluginLogStream = () => {
-  socket.init(receiveMessage, "");
-  setTimeout(() => {
-    if (socket.socket_open) {
-      socket.send({
-        type: 1,
-        joptions: null,
-        data: useTopoStore().node_click_info.target_ip + ":9995",
-      });
-    }
-  }, 500);
-};
+
+watch(()=>useLogStore().ws_isOpen,newV => {
+  if(newV) {
+    socket.send({
+      type: 1,
+      joptions: null,
+      data: useTopoStore().node_click_info.target_ip + ":9995",
+    });
+  }
+},{immediate:true})
 
 const receiveMessage = (message: any) => {
   let result = JSON.parse(message.data);
@@ -380,6 +378,7 @@ const getWsLogs = (params: any) => {
     from: params.from,
     size: params.size ? params.size : null,
   } as any;
+  if(!serviceList.value) return;
   let selected_service = serviceList.value.find((group: any) =>
     group.options.some((option: any) => option.label == params.service)
   );
@@ -404,6 +403,7 @@ const closeDialog = () => {
   socket.close();
   pluginlog_stream.value = [];
   pluginlog_total.value = 0;
+  serviceList.value = [];
 };
 
 /*
@@ -413,7 +413,6 @@ const closeDialog = () => {
 watch(
   () => useTopoStore().node_click_info,
   (node_click_info) => {
-    console.log("监听到新节点：", node_click_info);
     if (node_click_info.node_id) {
       dialog.value = true;
       if (log_type.value === "elk") {
@@ -424,7 +423,7 @@ watch(
         };
         handleShowLog(query_params);
       } else {
-        getPluginLogStream();
+        socket.init(receiveMessage, "");
       }
     }
   },
diff --git a/web/src/views/topoLogs/logStream_plugin.vue b/web/src/views/topoLogs/logStream_plugin.vue
index e6ca2b1ff711231e501bcff1e926aa2ce4d60d67..a0fbcafb0695f16f31fbaf62d8288a6588a3db69 100644
--- a/web/src/views/topoLogs/logStream_plugin.vue
+++ b/web/src/views/topoLogs/logStream_plugin.vue
@@ -35,7 +35,7 @@
         选择服务：<el-select
           v-model="service_key"
           placeholder="请选择主机服务"
-          style="width: 130px"
+          style="width: 140px"
           @change="searchService"
         >
           <el-option-group
@@ -57,13 +57,13 @@
         日志模式：<el-select
           v-model="realTime"
           placeholder="请选择日志模式"
-          style="width: 100px"
+          style="width: 120px"
           @change="isResetLog = true"
         >
           <el-option label="实时" :value="true"/>
           <el-option label="非实时" :value="false"/>
         </el-select>
-      </div>&emsp;
+      </div>&emsp;&emsp;
       <el-button type="primary" @click="handleSearch()">查询</el-button>
     </div>
     <div class="log_list">
@@ -111,9 +111,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watchEffect, watch, computed, onMounted } from "vue";
+import { ref, watchEffect, watch, onMounted,nextTick, reactive } from "vue";
 import { levels } from "./utils";
 import { formatDate } from "@/utils/dateFormat";
+import { useLogStore } from "@/stores/log";
+import { useTopoStore } from'@/stores/topo';
 
 const realTime = ref(false); // 是否实时监听日志变化
 const isResetLog = ref(false); // 是否清空日志重新查询
@@ -127,6 +129,7 @@ interface logItem {
   level: string;
   targetName: string;
 }
+
 let props = defineProps({
   log_data: {
     type: Array as () => logItem[],
@@ -144,16 +147,7 @@ let props = defineProps({
     required: false,
   },
 });
-watch(
-  () => props.service_list,
-  (new_list) => {
-    if (new_list.length > 0) {
-      service_options.value = props.service_list;
-      service_key.value = props.service_list[0].options[0].value;
-      handleSearch();
-    }
-  }
-);
+
 watchEffect(() => {
   if (props.log_data.length > 0) {
     log_stream.value = props.log_data;
@@ -166,21 +160,41 @@ watchEffect(() => {
     isloading.value = false;
   }
 });
-interface TimeRange {
-  start: Date;
-  end: Date;
+interface LogSearchObj {
+    timeRange:[Date,Date];
+    level:string;
+    service:{label:string,value:string;}
+    realTime:boolean;
 }
+let logSearchItem = {} as LogSearchObj;
+watch([()=> useTopoStore().node_click_info.target_ip,()=> props.service_list],(newVal,oldVal) => {
+  if(newVal[0] && newVal[1].length>0) {
+    nextTick(() => {
+      service_options.value = props.service_list;
+      let ip_index = useLogStore().search_list.findIndex(item => item.ip === newVal[0]);
+      if(ip_index !== -1) {
+        level_key.value = useLogStore().search_list[ip_index].level;
+        log_time.value = useLogStore().search_list[ip_index].timeRange;
+        service_key.value = useLogStore().search_list[ip_index].service.value;
+        realTime.value = useLogStore().search_list[ip_index].realTime;
+      } else {
+        service_key.value = props.service_list[0].options[0].value;
+      }
+      handleSearch();
+    })
+  }
+},{immediate:true})
+
 let emit = defineEmits<{
-  getMore: [value: number];
-  getTimeRangeLog: [time_range: TimeRange];
   getWsLogs: [params: {}];
 }>();
 
 // 等级搜索功能
-const level_key = ref("6");
+const level_key = ref('6');
 let level_options = levels;
 const searchLevel = (level: string) => {
   isResetLog.value = true;
+  logSearchItem.level = level;
 };
 
 // 服务搜索功能
@@ -193,11 +207,14 @@ interface SelectGroupItem {
     }
   ];
 }
-const service_key = ref("");
+const service_key = ref('');
 let service_options = ref<SelectGroupItem[]>();
 const searchService = (service: string) => {
-  // console.log(service)
   isResetLog.value = true;
+  logSearchItem.service = {
+    label:service,
+    value:service
+  }
 };
 
 // 时间筛选功能
@@ -210,11 +227,18 @@ const ChangeTimeRange = (value: any) => {
     isResetLog.value = true;
     log_time.value[0] = value[0];
     log_time.value[1] = value[1];
+    logSearchItem.timeRange = value;
   }
 };
 
 // 查询方法
 const handleSearch = () => {
+  is_continue.value = true;
+  logSearchItem.level = level_key.value;
+  logSearchItem.service = {label:service_key.value,value:service_key.value};
+  logSearchItem.timeRange = log_time.value;
+  logSearchItem.realTime = realTime.value;
+  useLogStore().updateLogList({ip:useTopoStore().node_click_info.target_ip,...logSearchItem})
   emit("getWsLogs", {
     severity: level_key.value,
     service: service_key.value,