diff --git a/src/config/getData.js b/src/config/getData.js
index e0eb070..66e7445 100644
--- a/src/config/getData.js
+++ b/src/config/getData.js
@@ -11,6 +11,7 @@ export const setStation = (sn) => post('teaching/setStation?stationName=' + sn,
 export const stopMapping = () => post('teaching/stopMapping', {})
 export const getLocalMaps = () => post('teaching/getLocalMaps', {})
 export const oneClickDeployment = (map) => post('teaching/oneClickDeployment?mapName=' + map, {})
+export const abandonMapping = () => post('teaching/abandonMapping', {})
 
 // 操作
 export const queryStation = () => post('api/operate/queryStation', {})
diff --git a/src/images/new/agv.png b/src/images/new/agv.png
index bb3117f..12e5db3 100644
Binary files a/src/images/new/agv.png and b/src/images/new/agv.png differ
diff --git a/src/images/new/car.png b/src/images/new/car.png
new file mode 100644
index 0000000..1806599
Binary files /dev/null and b/src/images/new/car.png differ
diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue
index 05b677d..9b58d88 100644
--- a/src/pages/modules/building.vue
+++ b/src/pages/modules/building.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { startMapping, setStation, stopMapping, getLocalMaps, oneClickDeployment } from '@config/getData.js'
+import { startMapping, setStation, stopMapping, getLocalMaps, oneClickDeployment, abandonMapping } from '@config/getData.js'
 export default {
   beforeRouteLeave (to, from, next) {
     if (this.needsConfirmation) {
@@ -49,8 +49,32 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        next() // 允许离开
+      }).then(async () => {
+        try {
+          // 显示加载中状态
+          this.loading = this.$loading({
+            lock: true,
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.6)'
+          })
+          // 调用放弃建图接口
+          const res = await abandonMapping()
+          this.loading.close()
+          if (res && res.code === 200) {
+            // 接口成功，允许离开页面
+            this.needsConfirmation = false // 标记无需再确认
+            next()
+          } else {
+            // 接口返回失败，提示错误并阻止离开
+            this.$message.error(res.message || '放弃建图失败，请重试')
+            next(false)
+          }
+        } catch (error) {
+          // 发生异常，提示错误并阻止离开
+          this.loading.close()
+          this.$message.error('操作失败：' + error.message)
+          next(false)
+        }
       }).catch(() => {
         next(false) // 阻止离开
       })
diff --git a/src/pages/modules/map.vue b/src/pages/modules/map.vue
index 93b3825..2e02137 100644
--- a/src/pages/modules/map.vue
+++ b/src/pages/modules/map.vue
@@ -47,14 +47,35 @@
         <el-col :span="14"><p>{{ selectedPoint.angle }}</p></el-col>
       </el-row>
     </div>
+    <div
+      v-if="showPathPopup"
+      class="point-popup"
+      :style="pathPopupStyle"
+      @click.stop
+    >
+      <el-row type="flex" justify="space-between" class="popup-content" style="border-bottom: 1px solid #fff;">
+        <el-col :span="10"><h3>路径ID</h3></el-col>
+        <el-col :span="14"><p>{{selectedPath.route_id}}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>起点编码</h3></el-col>
+        <el-col :span="14"><p>{{getStationNameById(selectedPath.start_id)}}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>终点编码</h3></el-col>
+        <el-col :span="14"><p>{{getStationNameById(selectedPath.end_id)}}</p></el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
 import { throttle } from 'lodash'
 import markerImage from '@images/new/agv.png'
+import carImage from '@images/new/car.png'
 import { getMapInfoByCode, getRouteInfo, queryMapAllStation } from '@config/getData.js'
 import canvasZoomDrag from '@config/canvasZoomDrag'
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
@@ -69,25 +90,72 @@ export default {
       selectedPointId: null,
       cachedImages: {
         map: null,
-        marker: null
+        marker: null,
+        car: null
       },
       imageLoadStatus: {
         map: false,
-        marker: false
+        marker: false,
+        car: false
+      },
+      showPathPopup: false,
+      selectedPath: {route_id: null},
+      pathPopupStyle: { left: '0px', top: '0px' },
+      pathClickThreshold: 5
+    }
+  },
+  computed: {
+    ...mapGetters(['agvObj']),
+    carData () {
+      try {
+        return JSON.parse(this.agvObj)
+      } catch (error) {
+        console.error('解析 JSON 时出错:', error)
+        return {}
       }
     }
   },
   mixins: [canvasZoomDrag],
   mounted () {
     this.preloadMarkerImage()
+    this.preloadCarImage()
     this.loadAllDataInParallel()
     document.addEventListener('click', this.handleDocumentClick)
+    this.carPositionWatcher = this.$watch(
+      () => this.carData,
+      (newVal) => {
+        if (newVal && newVal.x !== undefined && newVal.y !== undefined) {
+          this.redrawCanvas()
+        }
+      },
+      { deep: true }
+    )
   },
   beforeDestroy () {
-    // 移除事件监听
     document.removeEventListener('click', this.handleDocumentClick)
+    if (this.carPositionWatcher) {
+      this.carPositionWatcher()
+    }
   },
   methods: {
+    preloadCarImage () {
+      if (this.cachedImages.car) {
+        this.imageLoadStatus.car = true
+        return
+      }
+      const img = new Image()
+      img.src = carImage
+      img.onload = () => {
+        this.cachedImages.car = img
+        this.imageLoadStatus.car = true
+        this.checkImagesLoadedAndRedraw()
+      }
+      img.onerror = () => {
+        console.error('小车图片加载失败')
+        this.imageLoadStatus.car = true
+        this.checkImagesLoadedAndRedraw()
+      }
+    },
     preloadMarkerImage () {
       if (this.cachedImages.marker) {
         this.imageLoadStatus.marker = true
@@ -131,7 +199,7 @@ export default {
       })
     },
     checkImagesLoadedAndRedraw () {
-      if (this.imageLoadStatus.map && this.imageLoadStatus.marker) {
+      if (this.imageLoadStatus.map && this.imageLoadStatus.marker && this.imageLoadStatus.car) {
         this.redrawCanvas()
       }
     },
@@ -230,22 +298,28 @@ export default {
       }
       this.drawPath()
       this.drawMarkers()
+      this.drawCar()
       this.ctx.restore()
     }, 30),
     drawPath () {
       if (!this.pathData.length) return
-      this.ctx.beginPath()
       this.pathData.forEach((point, index) => {
         const startX = (point.start_x - this.mapData.x) / this.mapData.resolution
         const startY = this.mapData.height - (point.start_y - this.mapData.y) / this.mapData.resolution
         const endX = (point.end_x - this.mapData.x) / this.mapData.resolution
         const endY = this.mapData.height - (point.end_y - this.mapData.y) / this.mapData.resolution
+        this.ctx.beginPath()
         this.ctx.moveTo(startX, startY)
         this.ctx.lineTo(endX, endY)
+        if (this.selectedPath.route_id === point.route_id) {
+          this.ctx.strokeStyle = '#ff5722' // 橙色高亮
+          this.ctx.lineWidth = 4
+        } else {
+          this.ctx.strokeStyle = '#009de5' // 默认蓝色
+          this.ctx.lineWidth = 2
+        }
+        this.ctx.stroke()
       })
-      this.ctx.strokeStyle = '#009de5'
-      this.ctx.lineWidth = 2
-      this.ctx.stroke()
     },
     drawMarkers () {
       if (!this.pointData.length) return
@@ -275,10 +349,24 @@ export default {
         this.ctx.fillText(point.station_name, x, y + 18)
       })
     },
+    drawCar () {
+      if (!this.carData || !this.cachedImages.car || !this.mapData) return
+      const carX = (this.carData.x - this.mapData.x) / this.mapData.resolution
+      const carY = this.mapData.height - (this.carData.y - this.mapData.y) / this.mapData.resolution
+      this.ctx.drawImage(
+        this.cachedImages.car,
+        carX - 35,
+        carY - 21,
+        70,
+        42
+      )
+    },
     handleCanvasClick (event) {
       const rect = this.canvas.getBoundingClientRect()
       const mouseX = (event.clientX - rect.left) / this.scale
       const mouseY = (event.clientY - rect.top) / this.scale
+      // 1. 优先检测点位点击
+      let pointClicked = false
       this.pointData.forEach(point => {
         let x = (point.x - this.mapData.x) / this.mapData.resolution
         let y = this.mapData.height - (point.y - this.mapData.y) / this.mapData.resolution
@@ -288,10 +376,62 @@ export default {
         if (mouseX >= x - 10 && mouseX <= x + 10 && mouseY >= y - 10 && mouseY <= y + 10) {
           this.handlePointSelect(point, event)
           event.stopPropagation()
+          pointClicked = true
         }
       })
+      // 2. 只有点位未被点击时，才检测路径点击
+      if (!pointClicked) {
+        const clickedPath = this.detectPathClick(mouseX, mouseY)
+        if (clickedPath) {
+          this.handlePathSelect(clickedPath, event)
+          event.stopPropagation()
+        }
+      }
+    },
+    // 检测路径点击
+    detectPathClick (mouseX, mouseY) {
+      if (!this.pathData.length) return null
+      for (const path of this.pathData) {
+        // 计算路径线段的Canvas坐标
+        const startX = (path.start_x - this.mapData.x) / this.mapData.resolution
+        const startY = this.mapData.height - (path.start_y - this.mapData.y) / this.mapData.resolution
+        const endX = (path.end_x - this.mapData.x) / this.mapData.resolution
+        const endY = this.mapData.height - (path.end_y - this.mapData.y) / this.mapData.resolution
+        // 计算点击点到线段的距离
+        const distance = this.pointToLineDistance(
+          { x: mouseX, y: mouseY },
+          { x: startX, y: startY },
+          { x: endX, y: endY }
+        )
+        // 距离小于阈值则认为点击了该路径
+        if (distance <= this.pathClickThreshold) {
+          return path
+        }
+      }
+      return null
+    },
+    // 计算点到线段的最短距离
+    pointToLineDistance (point, lineStart, lineEnd) {
+      // 线段向量
+      const dx = lineEnd.x - lineStart.x
+      const dy = lineEnd.y - lineStart.y
+      // 线段长度的平方
+      const lengthSquared = dx * dx + dy * dy
+      // 线段长度为0（起点终点重合），直接返回点到起点的距离
+      if (lengthSquared === 0) {
+        return Math.hypot(point.x - lineStart.x, point.y - lineStart.y)
+      }
+      // 计算点击点在投影到线段上的位置比例（0~1之间为在线段上）
+      let t = ((point.x - lineStart.x) * dx + (point.y - lineStart.y) * dy) / lengthSquared
+      t = Math.max(0, Math.min(1, t)) // 限制在0~1范围内
+      // 投影点坐标
+      const projectionX = lineStart.x + t * dx
+      const projectionY = lineStart.y + t * dy
+      // 点到投影点的距离
+      return Math.hypot(point.x - projectionX, point.y - projectionY)
     },
     handlePointSelect (point, event) {
+      this.resetPathSelection()
       if (this.selectedPointId === point.station_id) {
         this.resetSelection()
       } else {
@@ -302,6 +442,20 @@ export default {
         this.redrawCanvas()
       }
     },
+    // 处理路径选中
+    handlePathSelect (path, event) {
+      // 关闭点位弹窗（避免冲突）
+      this.resetPointSelection()
+      if (this.selectedPath.route_id === path.route_id) {
+        // 再次点击同一路径关闭弹窗
+        this.resetPathSelection()
+      } else {
+        this.selectedPath = path
+        this.showPathPopup = true
+        this.calculatePathPopupPosition(event)
+        this.redrawCanvas() // 高亮显示选中路径
+      }
+    },
     calculatePopupPosition (event) {
       const popupWidth = 200
       const popupHeight = 180
@@ -314,16 +468,43 @@ export default {
 
       this.popupStyle = { left: `${left}px`, top: `${top}px` }
     },
+    // 计算路径弹窗位置
+    calculatePathPopupPosition (event) {
+      const popupWidth = 160
+      const popupHeight = 100
+      let left = event.clientX - 40
+      let top = event.clientY - 120
+      // 限制弹窗在窗口可视范围内
+      left = Math.max(10, Math.min(left, window.innerWidth - popupWidth - 10))
+      top = Math.max(10, Math.min(top, window.innerHeight - popupHeight - 10))
+      this.pathPopupStyle = { left: `${left}px`, top: `${top}px` }
+    },
     handleDocumentClick () {
       this.resetSelection()
     },
-    resetSelection () {
+    resetPointSelection () {
       if (this.selectedPointId) {
         this.selectedPointId = null
         this.selectedPoint = null
         this.showPopup = false
-        this.redrawCanvas()
       }
+    },
+    // 重置路径选中状态
+    resetPathSelection () {
+      if (this.selectedPath) {
+        this.selectedPath = {route_id: null}
+        this.showPathPopup = false
+      }
+    },
+    resetSelection () {
+      this.resetPointSelection()
+      this.resetPathSelection()
+      this.redrawCanvas()
+    },
+    getStationNameById (stationId) {
+      if (!stationId || !this.pointData || !this.pointData.length) return null
+      const station = this.pointData.find(point => point.station_id === stationId)
+      return station ? station.station_name : null
     }
   }
 }
@@ -360,7 +541,7 @@ export default {
   padding 10px
   box-shadow 0 0px 4px 2px rgba(255,255,255,0.1)
   z-index 100
-  min-width 150px
+  min-width 160px
   animation fadeIn 0.2s ease-out
   h3
     color #fff
diff --git a/src/pages/modules/map2.vue b/src/pages/modules/map2.vue
new file mode 100644
index 0000000..aff030b
--- /dev/null
+++ b/src/pages/modules/map2.vue
@@ -0,0 +1,430 @@
+
+<template>
+  <div class="page_container">
+    <div class="canvas-container">
+      <canvas
+        id="mapCanvas"
+        ref="mapCanvas"
+        @wheel="handleZoom"
+        @click="handleCanvasClick"
+        @touchstart="handleTouchStart"
+        @touchmove="handleTouchMove"
+        @mousedown="handleMouseDown"
+        @mousemove="handleMouseMove"
+        @mouseup="handleMouseUp"
+        @mouseleave="handleMouseUp"
+      ></canvas>
+      <el-row type="flex" justify="end" class="map_tools">
+        <el-button type="primary" :disabled="zoomPercentage === 2" icon="el-icon-minus" size="mini" style="border: 0;border-radius: 0;" @click="zoomOut"></el-button>
+        <div class="zoom_data">{{ zoomPercentage }}%</div>
+        <el-button type="primary" :disabled="zoomPercentage === 200" icon="el-icon-plus" size="mini" style="border: 0;border-radius: 0;" @click="zoomIn"></el-button>
+      </el-row>
+    </div>
+    <div
+      v-if="showPopup"
+      class="point-popup"
+      :style="popupStyle"
+      @click.stop
+    >
+      <el-row type="flex" justify="space-between" class="popup-content" style="border-bottom: 1px solid #fff;">
+        <el-col :span="10"><h3>编号</h3></el-col>
+        <el-col :span="14"><p>{{selectedPoint.station_code}}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>别名</h3></el-col>
+        <el-col :span="14"><p>{{selectedPoint.station_name}}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>X坐标</h3></el-col>
+        <el-col :span="14"><p>{{ selectedPoint.x }}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>Y坐标</h3></el-col>
+        <el-col :span="14"><p>{{ selectedPoint.y }}</p></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="popup-content">
+        <el-col :span="10"><h3>角度值</h3></el-col>
+        <el-col :span="14"><p>{{ selectedPoint.angle }}</p></el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { throttle } from 'lodash'
+import markerImage from '@images/new/agv.png'
+import carImage from '@images/new/car.png'
+import { getMapInfoByCode, getRouteInfo, queryMapAllStation } from '@config/getData.js'
+import canvasZoomDrag from '@config/canvasZoomDrag'
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      canvas: null, // Canvas 元素
+      ctx: null, // Canvas 绘图上下文
+      mapData: null, // 地图数据
+      pathData: null, // 路径数据
+      pointData: null, // 点位数据
+      showPopup: false,
+      selectedPoint: {},
+      popupStyle: {left: '0px', top: '0px'},
+      selectedPointId: null,
+      cachedImages: {
+        map: null,
+        marker: null,
+        car: null
+      },
+      imageLoadStatus: {
+        map: false,
+        marker: false,
+        car: false
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['agvObj'])
+  },
+  mixins: [canvasZoomDrag],
+  mounted () {
+    this.preloadMarkerImage()
+    this.preloadCarImage()
+    this.loadAllDataInParallel()
+    document.addEventListener('click', this.handleDocumentClick)
+    this.carPositionWatcher = this.$watch(
+      () => this.agvObj,
+      (newVal) => {
+        if (newVal && newVal.x !== undefined && newVal.y !== undefined) {
+          this.redrawCanvas()
+        }
+      },
+      { deep: true }
+    )
+  },
+  beforeDestroy () {
+    document.removeEventListener('click', this.handleDocumentClick)
+    if (this.carPositionWatcher) {
+      this.carPositionWatcher()
+    }
+  },
+  methods: {
+    preloadCarImage () {
+      if (this.cachedImages.car) {
+        this.imageLoadStatus.car = true
+        return
+      }
+      const img = new Image()
+      img.src = carImage
+      img.onload = () => {
+        this.cachedImages.car = img
+        this.imageLoadStatus.car = true
+        this.checkImagesLoadedAndRedraw()
+      }
+      img.onerror = () => {
+        console.error('小车图片加载失败')
+        this.imageLoadStatus.car = true
+        this.checkImagesLoadedAndRedraw()
+      }
+    },
+    preloadMarkerImage () {
+      if (this.cachedImages.marker) {
+        this.imageLoadStatus.marker = true
+        return
+      }
+      const img = new Image()
+      img.src = markerImage
+      img.onload = () => {
+        this.cachedImages.marker = img
+        this.imageLoadStatus.marker = true
+        this.checkImagesLoadedAndRedraw()
+      }
+      img.onerror = () => {
+        console.error('标记图片加载失败')
+        this.imageLoadStatus.marker = true
+        this.checkImagesLoadedAndRedraw()
+      }
+    },
+    loadMapImage () {
+      if (!this.mapData.mapImageAddress) {
+        return Promise.reject(new Error('地图数据缺失'))
+      }
+      if (this.cachedImages.map && this.imageLoadStatus.map) {
+        return Promise.resolve(this.cachedImages.map)
+      }
+      return new Promise((resolve, reject) => {
+        const img = new Image()
+        img.src = `${this.$store.getters.baseUrl}${this.mapData.mapImageAddress}`
+        // img.src = this.mapData.mapImageAddress
+        img.onload = () => {
+          this.cachedImages.map = img
+          this.imageLoadStatus.map = true
+          this.checkImagesLoadedAndRedraw()
+          resolve(img)
+        }
+        img.onerror = (error) => {
+          console.error('地图图片加载失败:', error)
+          this.imageLoadStatus.map = true
+          reject(error)
+        }
+      })
+    },
+    checkImagesLoadedAndRedraw () {
+      if (this.imageLoadStatus.map && this.imageLoadStatus.marker && this.imageLoadStatus.car) {
+        this.redrawCanvas()
+      }
+    },
+    async loadAllDataInParallel () {
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        const [mapData, pathData, stations] = await Promise.all([
+          this._getMapInfoByCode(),
+          this._getRouteInfo(),
+          this._queryMapAllStation()
+        ])
+        this.mapData = mapData
+        this.pathData = [...pathData]
+        this.pointData = this.filterPointData(pathData, stations)
+        this.initCanvas()
+        await this.loadMapImage()
+        this.loading.close()
+      } catch (e) {
+        this.$message.error(`数据加载失败: ${e.message || '未知错误'}`)
+        this.loading.close()
+      }
+    },
+    async _getMapInfoByCode () {
+      try {
+        const res = await getMapInfoByCode()
+        if (!res) throw new Error('地图信息为空')
+        return res
+      } catch (e) {
+        console.error('获取地图信息失败:', e)
+        throw new Error(`获取地图信息失败: ${e.message}`)
+      }
+    },
+    async _getRouteInfo () {
+      try {
+        const res = await getRouteInfo()
+        if (!res) throw new Error('路径信息为空')
+        return res
+      } catch (e) {
+        console.error('获取路径信息失败:', e)
+        throw new Error(`获取路径信息失败: ${e.message}`)
+      }
+    },
+    async _queryMapAllStation () {
+      try {
+        const res = await queryMapAllStation()
+        if (!res) throw new Error('站点信息为空')
+        return res
+      } catch (e) {
+        console.error('获取站点信息失败:', e)
+        throw new Error(`获取站点信息失败: ${e.message}`)
+      }
+    },
+    filterPointData (routes, stations) {
+      const result = []
+      const seenStationIds = new Set()
+      routes.forEach(route => {
+        const startStation = stations.find(s => s.station_id === route.start_id)
+        const endStation = stations.find(s => s.station_id === route.end_id)
+        if (startStation && !seenStationIds.has(startStation.station_id)) {
+          result.push(startStation)
+          seenStationIds.add(startStation.station_id)
+        }
+        if (endStation && !seenStationIds.has(endStation.station_id)) {
+          result.push(endStation)
+          seenStationIds.add(endStation.station_id)
+        }
+      })
+      return result
+    },
+    initCanvas () {
+      this.canvas = this.$refs.mapCanvas
+      this.ctx = this.canvas.getContext('2d')
+      this.canvas.width = this.mapData.width
+      this.canvas.height = this.mapData.height
+      this.redrawCanvas()
+    },
+    redrawCanvas: throttle(function () {
+      if (!this.ctx || !this.mapData) return
+      this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height)
+      this.ctx.save()
+      // 绘制地图背景
+      if (this.cachedImages.map) {
+        this.ctx.drawImage(
+          this.cachedImages.map,
+          0, 0,
+          this.canvas.width,
+          this.canvas.height
+        )
+      } else {
+        this.ctx.fillStyle = '#ccc'
+        this.ctx.fillText('地图加载中...', 50, 50)
+      }
+      this.drawPath()
+      this.drawMarkers()
+      this.drawCar()
+      this.ctx.restore()
+    }, 30),
+    drawPath () {
+      if (!this.pathData.length) return
+      this.ctx.beginPath()
+      this.pathData.forEach((point, index) => {
+        const startX = (point.start_x - this.mapData.x) / this.mapData.resolution
+        const startY = this.mapData.height - (point.start_y - this.mapData.y) / this.mapData.resolution
+        const endX = (point.end_x - this.mapData.x) / this.mapData.resolution
+        const endY = this.mapData.height - (point.end_y - this.mapData.y) / this.mapData.resolution
+        this.ctx.moveTo(startX, startY)
+        this.ctx.lineTo(endX, endY)
+      })
+      this.ctx.strokeStyle = '#009de5'
+      this.ctx.lineWidth = 2
+      this.ctx.stroke()
+    },
+    drawMarkers () {
+      if (!this.pointData.length) return
+      const markerSize = 10 // 标记大小随缩放变化
+      this.pointData.forEach(point => {
+        const x = (point.x - this.mapData.x) / this.mapData.resolution
+        const y = this.mapData.height - (point.y - this.mapData.y) / this.mapData.resolution
+        // 绘制选中状态
+        if (point.station_id === this.selectedPointId) {
+          this.ctx.beginPath()
+          this.ctx.arc(x, y, 5, 0, Math.PI * 2)
+          this.ctx.fillStyle = '#59ccd2'
+          this.ctx.fill()
+        } else if (this.cachedImages.marker) {
+          this.ctx.drawImage(
+            this.cachedImages.marker,
+            x - markerSize / 2, // 居中对齐
+            y - markerSize / 2,
+            markerSize,
+            markerSize
+          )
+        }
+        // 绘制点位名称（文字大小随缩放变化）
+        this.ctx.font = '12px Arial'
+        this.ctx.fillStyle = 'white'
+        this.ctx.textAlign = 'center'
+        this.ctx.fillText(point.station_name, x, y + 18)
+      })
+    },
+    drawCar () {
+      console.log(this.$store.getters.agvObj)
+      if (!this.agvObj || !this.cachedImages.car || !this.mapData) return
+      const carX = (this.agvObj.x - this.mapData.x) / this.mapData.resolution
+      const carY = this.mapData.height - (this.agvObj.y - this.mapData.y) / this.mapData.resolution
+      this.ctx.drawImage(
+        this.cachedImages.car,
+        carX - 35,
+        carY - 21,
+        70,
+        42
+      )
+    },
+    handleCanvasClick (event) {
+      const rect = this.canvas.getBoundingClientRect()
+      const mouseX = (event.clientX - rect.left) / this.scale
+      const mouseY = (event.clientY - rect.top) / this.scale
+      this.pointData.forEach(point => {
+        let x = (point.x - this.mapData.x) / this.mapData.resolution
+        let y = this.mapData.height - (point.y - this.mapData.y) / this.mapData.resolution
+        x = Math.abs(x) === 0 ? 0 : x
+        y = Math.abs(y) === 0 ? 0 : y
+        // 检查点击位置是否在标记图片内
+        if (mouseX >= x - 10 && mouseX <= x + 10 && mouseY >= y - 10 && mouseY <= y + 10) {
+          this.handlePointSelect(point, event)
+          event.stopPropagation()
+        }
+      })
+    },
+    handlePointSelect (point, event) {
+      if (this.selectedPointId === point.station_id) {
+        this.resetSelection()
+      } else {
+        this.selectedPointId = point.station_id
+        this.selectedPoint = point
+        this.showPopup = true
+        this.calculatePopupPosition(event)
+        this.redrawCanvas()
+      }
+    },
+    calculatePopupPosition (event) {
+      const popupWidth = 200
+      const popupHeight = 180
+      let left = event.clientX - 40
+      let top = event.clientY - 150
+
+      // 限制弹窗在窗口可视范围内
+      left = Math.max(10, Math.min(left, window.innerWidth - popupWidth - 10))
+      top = Math.max(10, Math.min(top, window.innerHeight - popupHeight - 10))
+
+      this.popupStyle = { left: `${left}px`, top: `${top}px` }
+    },
+    handleDocumentClick () {
+      this.resetSelection()
+    },
+    resetSelection () {
+      if (this.selectedPointId) {
+        this.selectedPointId = null
+        this.selectedPoint = null
+        this.showPopup = false
+        this.redrawCanvas()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.canvas-container
+  position relative
+  display flex
+  justify-content: center;
+  align-items: center;
+  height calc(100% - .32rem)
+  background-color rgba(4, 33, 58, 70%)
+  box-shadow inset 1px 1px 7px 2px #4d9bcd
+  overflow hidden
+.map_tools
+  position absolute
+  top 0
+  right 0
+.zoom_data
+  width .6rem
+  font-size .16rem
+  height .32rem
+  line-height .32rem
+  color #00d9f3
+  text-align center
+  border-top 1px solid #009fde
+  border-bottom 1px solid #009fde
+.point-popup
+  position fixed
+  background rgba(0, 0, 0, 70%)
+  border 1px solid rgba(255, 255, 255, .3)
+  border-radius: 8px;
+  padding 10px
+  box-shadow 0 0px 4px 2px rgba(255,255,255,0.1)
+  z-index 100
+  min-width 150px
+  animation fadeIn 0.2s ease-out
+  h3
+    color #fff
+    font-size 14px
+    line-height 24px
+    text-align center
+  p
+    color #fff
+    font-size 14px
+    line-height 24px
+    text-align center
+@keyframes fadeIn {
+  from { opacity: 0; transform: translateY(5px); }
+  to { opacity: 1; transform: translateY(0); }
+}
+</style>