From c2ab0aa8f2acf0b2e7900a643a2f63e86a226cde Mon Sep 17 00:00:00 2001
From: zhanghao <774378400@qq.com>
Date: Wed, 5 Aug 2026 17:34:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/components/MapOverview.vue        | 78 ++++++++++++++++---
 1 file changed, 67 insertions(+), 11 deletions(-)

diff --git a/src/views/inspection/cockpit/components/MapOverview.vue b/src/views/inspection/cockpit/components/MapOverview.vue
index 40d97b4..f99b580 100644
--- a/src/views/inspection/cockpit/components/MapOverview.vue
+++ b/src/views/inspection/cockpit/components/MapOverview.vue
@@ -71,9 +71,12 @@
             <!-- <div class="split-line"></div> -->
             <div class="alarm-container">
                 <div class="container-title">告警记录</div>
-                <div class="alarm-box" v-for="item, index in 2">
-                    <div class="title">#01 检测到异常噪声</div>
-                    <div class="alarm-info">14:28:33 — 厂区A 东侧走廊</div>
+                <div class="alarm-box" v-for="item, index in alarmRecord">
+                    <div class="alarm-title" :class="item.resultStatus">
+                        <div class="title">{{ item.resultName }}</div>
+                        <div class="status">{{ getOptionLabel(resultStatusOptions, item.resultStatus) }}</div>
+                    </div>
+                    <div class="alarm-info">{{ item.createTime }}</div>
                 </div>
             </div>
         </div>
@@ -86,8 +89,7 @@ import MapCanvas from "./MapCanvas.vue";
 import { onMounted, onUnmounted } from "vue";
 import { getRobotList } from '@/api/inspection/robot'
 import { getRunTaskList } from '@/api/inspection/runTask'
-
-console.log('sss', import.meta.env.VITE_INSPECTION_TYPE)
+import { getInspectionResultList } from '@/api/inspection/result'
 
 const robotList = ref([])
 const robotStatus = {
@@ -110,7 +112,7 @@ const getRobot = async () => {
 
     if (res.code === 200) {
         robotList.value = res.rows
-        // getRobot()
+        getRobot()
     }
 }
 
@@ -161,9 +163,31 @@ const centerCanvasView = () => {
     }
 }
 
+const alarmRecord = ref([])
+const resultStatusOptions = [
+  { label: '待处理', value: 'PENDING' },
+  { label: '正常', value: 'NORMAL' },
+  { label: '异常', value: 'ABNORMAL' },
+  { label: '识别失败', value: 'RECOGNIZE_FAILED' }
+]
+const getAlarmRecord = async () => { 
+    const res = await getInspectionResultList({
+        pageNum: 1,
+        pageSize: 10
+    })
+    if (res.code === 200) {
+        alarmRecord.value = res.rows
+    }
+}
+
+const getOptionLabel = (options, value) => {
+  return options.find(item => item.value === value)?.label || value || '-'
+}
+
 onMounted(() => {
     getRobot()
     getRunningTask()
+    getAlarmRecord()
 })
 </script>
 
@@ -387,13 +411,45 @@ onMounted(() => {
                 padding: 16px;
                 margin-bottom: 16px;
 
-                .title {
-                    color: #FF6B6B;
-                    font-size: 14px;
-                    font-family: Inter;
-                    font-weight: bold;
+                .alarm-title {
+                    display: flex;
+                    justify-content: space-between;
+
+                    .title {
+                        font-size: 14px;
+                        font-family: Inter;
+                        font-weight: bold;
+                    }
+
+                    .status {
+                        font-size: 12px;
+                        border-radius: 12px;
+                        padding: 0 8px;
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                    }
                 }
 
+                .NORMAL {
+                    color: #00D4FF;
+                }
+
+                .ABNORMAL {
+                    color: #FF6B6B;
+                }
+
+                .PENDING {
+                    color: #8899BB;
+                }
+
+                .RECOGNIZE_FAILED {
+                    color: #FF6B6B;
+                    font-size: 12px;
+                }
+
+                
+
                 .alarm-info {
                     margin: 10px 0;
                     font-size: 12px;

From 2715d02c223c4f01ae19572bee133329ab285bc6 Mon Sep 17 00:00:00 2001
From: zhanghao <774378400@qq.com>
Date: Thu, 6 Aug 2026 09:08:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=99=BA=E8=83=BD=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=80=89=E6=8B=A9=E6=9C=BA=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/cockpit/components/Monitor.vue | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/views/inspection/cockpit/components/Monitor.vue b/src/views/inspection/cockpit/components/Monitor.vue
index b158262..ee1ab54 100644
--- a/src/views/inspection/cockpit/components/Monitor.vue
+++ b/src/views/inspection/cockpit/components/Monitor.vue
@@ -8,7 +8,7 @@
                         <div><SvgIcon name="bot" color="#fff" /></div>
                         <div class="bot-name">全部</div>
                     </div>
-                    <div v-for="item, index in 4" class="robot" :class="{ active: activeBot === index + 1 }" @click="changeBot(index + 1)">
+                    <div v-for="item, index in robotList" class="robot" :class="{ active: activeBot === index + 1 }" @click="changeBot(index + 1)">
                         <div>
                             <SvgIcon name="bot" :color="colorList[index]" />
                         </div>
@@ -41,15 +41,37 @@
 <script setup>
 import SvgIcon from "@/components/SvgIcon";
 import IPlayer from "@/components/IPlayer/index.vue";
+import { getRobotList } from '@/api/inspection/robot'
 
 const videoUrl = ref('https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8')
 
 const colorList = ['#00D4FF', '#FFB300', '#00FF88', '#fd00ff']
 
+const robotList = ref([])
+
 const activeBot = ref(0)
 const changeBot = (index) => {
     activeBot.value = index
 }
+
+const fetchRobotList = async () => {
+    try {
+        const res = await getRobotList({
+            robotType: 2,
+        })
+        if (res.code === 200) {
+            robotList.value = res.rows
+        } else {
+            console.error('获取机器人列表失败:', res.message)
+        }
+    } catch (error) {
+        console.error('获取机器人列表失败:', error)
+    }
+}
+
+onMounted(() => {
+    fetchRobotList()
+})
 </script>
 <style lang="scss" scoped>
 .page-container {

From 2ae34b1f9ffd5826da6d0e83829502bde33ab237 Mon Sep 17 00:00:00 2001
From: zhanghao <774378400@qq.com>
Date: Thu, 6 Aug 2026 11:21:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=8A=A0=E8=BD=BD=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/cockpit/components/MapCanvas.vue   | 7 +++++--
 src/views/inspection/cockpit/components/MapOverview.vue | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/inspection/cockpit/components/MapCanvas.vue b/src/views/inspection/cockpit/components/MapCanvas.vue
index 3d15dfc..38bc2bc 100644
--- a/src/views/inspection/cockpit/components/MapCanvas.vue
+++ b/src/views/inspection/cockpit/components/MapCanvas.vue
@@ -350,9 +350,12 @@ const centerCanvasView = () => {
 }
 
 const loadSourceMap = async () => {
+    const connectedRobot = props.robotList.find(item => item.connectStatus == 1);
+    if (!connectedRobot) return;
+
     const res = await getMapJson({
-        robotId: props.robotList[0].id,
-        mapName: props.robotList[0].robotMapName
+        robotId: connectedRobot.id,
+        mapName: connectedRobot.robotMapName
     });
     if (res.code === 200) {
         try {
diff --git a/src/views/inspection/cockpit/components/MapOverview.vue b/src/views/inspection/cockpit/components/MapOverview.vue
index f99b580..4ba008f 100644
--- a/src/views/inspection/cockpit/components/MapOverview.vue
+++ b/src/views/inspection/cockpit/components/MapOverview.vue
@@ -112,7 +112,7 @@ const getRobot = async () => {
 
     if (res.code === 200) {
         robotList.value = res.rows
-        getRobot()
+        // getRobot()
     }
 }