From b226f189c3a49f1c1e61a24f04c56b71da814bf6 Mon Sep 17 00:00:00 2001
From: xhf <1424913779@qq.com>
Date: Tue, 4 Mar 2025 17:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=97=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/board/allBoard/index.vue            |  4 +-
 .../realTimeMap/components/indexPage.vue      | 44 +++++++++++++++++--
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue
index 0a121d19..2f256b24 100644
--- a/src/views/board/allBoard/index.vue
+++ b/src/views/board/allBoard/index.vue
@@ -41,7 +41,7 @@
               <el-col :span="4">
                 <div class="top-item" style="border: none; color: #c60606">
                   <div class="top-item-title"> 异常 </div>
-                  <div class="top-item-num"> {{ data.taskStatusVO.abnormalNum || 0 }} </div>
+                  <div class="top-item-num" style="color: #c60606"> {{ data.taskStatusVO.abnormalNum || 0 }} </div>
                 </div>
               </el-col>
             </el-row>
@@ -87,7 +87,7 @@
               <el-col :span="4">
                 <div class="top-item" style="border: none; color: #c60606">
                   <div class="top-item-title"> 故障 </div>
-                  <div class="top-item-num"> {{ data.statistics.fault || 0 }} </div>
+                  <div class="top-item-num" style="color: #c60606"> {{ data.statistics.fault || 0 }} </div>
                 </div>
               </el-col>
             </el-row>
diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue
index fb9fa5b4..9015d201 100644
--- a/src/views/mapPage/realTimeMap/components/indexPage.vue
+++ b/src/views/mapPage/realTimeMap/components/indexPage.vue
@@ -448,6 +448,7 @@ const carPointListFun = () => {
   // let data2 = JSON.parse(data['d0:65:78:c4:af:cc'])
   // console.log(data2)
 }
+
 //是否可以拖拽
 const isDrag = ref(false)
 const changeIsDrag = () => {
@@ -781,9 +782,19 @@ const linkWebSocket = (url) => {
   if (socketClient.value) {
     // 监听消息
     socketClient.value.onMessage((message) => {
-      console.log('收到消息:', message)
-      if (message.type == 'map_push') {
-        let data = JSON.parse(testJson.content)
+      console.log('收到消息:', message, window)
+      //     ElMessage({
+      //     message: () => h('div', {
+      //     onClick: () => lookError(),
+      //     style: { cursor: 'pointer' }
+      //   }, '这是一个可点击的消息'),
+      //   showClose: true,
+      //   duration: 0, // 让消息持续显示，直到用户关闭
+      // });
+      if (message == 'ping' || message == 'pong') return
+      let jsonMsg = JSON.parse(message)
+      if (jsonMsg.type == 'map_push') {
+        let data = JSON.parse(jsonMsg.content)
         // console.log("============",data)
         let dataList = []
         for (let key in data) {
@@ -795,9 +806,33 @@ const linkWebSocket = (url) => {
         // console.log('=====', dataList)
         testCarList.value = dataList
       }
+      if (jsonMsg.type == 'agv_warn') {
+        //       ElMessage({
+        //           dangerouslyUseHTMLString: true,
+        //            message: `<span>${JSON.parse(jsonMsg.content)}</span> <el-button id="custom-button" @click="lookError">查看更多</el-button>`,
+        // })
+        ElMessage({
+          message: () =>
+            h(
+              'div',
+              {
+                onClick: () => lookError(),
+                style: { cursor: 'pointer' }
+              },
+              `${JSON.parse(jsonMsg.content)}`
+            ),
+          showClose: false,
+          duration: 2000, // 让消息持续显示，直到用户关闭
+          type: 'error'
+        })
+      }
     })
   }
 }
+
+const lookError = () => {
+  console.log('点击了')
+}
 // 发送websocket消息
 const sendMessage = () => {
   socketClient.value.send('Hello, WebSocket!')
@@ -989,7 +1024,8 @@ const observeWidthChange = (id, callback) => {
 let stopObserving
 defineExpose({ getMapData }) // 提供 open 方法，用于打开弹窗
 onMounted(() => {
-  carPointListFun()
+  window.lookError = lookError
+  // carPointListFun()
   // getList()
   window.addEventListener('resize', computedRatio)
   stopObserving = observeWidthChange('indexpage-container', (newWidth) => {