From b8a043314eb644f45e3e110c75c29b19218c2ae8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 09:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingun.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 57c72c1..2815f63 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -28,7 +28,7 @@
const showModal = ref(false)
const blindb = ref(false)
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassTwo`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/cacheGlassTwo`;
const handleMessage = (data) => {
// 鎶ヨ淇℃伅
if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
@@ -392,6 +392,7 @@
<el-icon><WarnTriangleFilled /></el-icon>
<span class="alert-text">
{{ alertText }} (id:{{ alertMessage }})
+ <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
</span>
</div>
<button @click="showAlert = false" class="close-btn">脳</button>
@@ -593,4 +594,11 @@
max-width: 80%; /* 闃叉灏忓睆骞曟孩鍑� */
min-width: 400px; /* 鏈�灏忓搴︿繚璇� */
}
-</style>
+.confirm-text {
+ color: rgb(242, 121, 8);
+ display: block; /* 寮哄埗鎹㈣ */
+ text-align: center; /* 姘村钩灞呬腑 */
+ margin-top: 4px; /* 涓庝笂涓�琛屼繚鎸侀棿璺� */
+ font-weight: 500; /* 鍔犵矖绐佸嚭 */
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0