Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-12 1449f79f342919f5b65003312b113a8dad229692

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -1084,7 +1084,7 @@
  }
]
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassOne`;
const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassOne`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
  window.localStorage.setItem('currentPage', newVal);