Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-17 b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6

 UI-Project/src/views/Caching/cachingbefore.vue

@@ -30,7 +30,7 @@
const showModal = ref(false)
const blindb = ref(false)
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassOne`;
const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/cacheGlassOne`;
const handleMessage = (data) => {
    // 报警信息
if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {