平台概览车辆移动

README.md

@@ -121,4 +121,7 @@ function getUserOptions() {
     userOptions.value = res.rows;
  
   });
-}
+}
+
+使用SockJS + STOMP协议
+滑出蓝色 滑入黄色

package.json

@@ -15,11 +15,10 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "2.0.10",
+    "@stomp/stompjs": "^7.1.1",
     "@supermap/iclient-ol": "^11.1.1",
     "@vueuse/core": "9.5.0",
     "axios": "0.27.2",
-    "ol": "6.15.1",
-    "proj4": "^2.17.0",
     "echarts": "5.4.0",
     "element-plus": "2.2.21",
     "file-saver": "2.0.5",
@@ -28,7 +27,10 @@
     "jsencrypt": "3.3.1",
     "leaflet-minimap": "^3.6.1",
     "nprogress": "0.2.0",
+    "ol": "6.15.1",
     "pinia": "2.0.22",
+    "proj4": "^2.17.0",
+    "sockjs-client": "^1.6.1",
     "vue": "3.2.45",
     "vue-cropper": "1.0.3",
     "vue-router": "4.1.4"

src/components/map/OpenLayersMap.vue

@@ -344,7 +344,8 @@ defineExpose({
   zoomOut,
   compass,
   resetView,
-  getCurrentMapState // 暴露获取当前地图状态的方法
+  getCurrentMapState, // 暴露获取当前地图状态的方法
+  map // 暴露地图实例
 });
 </script>
 

src/components/map/controls/LayerSwitcher.vue

@@ -161,9 +161,12 @@ import Overlay from 'ol/Overlay';
 import labelBg from '../../../assets/images/label_bg.png';
 
 // 导入车辆图标
-import car1Icon from '../../../assets/images/Aircraft.png';
+import car1Icon from '../../../assets/images/Aircraft.png'; //滑入航空器
+import car1Icon1 from '../../../assets/images/Aircraft1.png'; //滑出航空器
 import car2Icon from '../../../assets/images/noPeopleCar.png';
 import noPeopleCarIcon from '../../../assets/images/noPeopleCar.png';
+import airportBg from '../../../assets/images/airport_bg.png'; // 蓝色背景
+import airportOutBg from '../../../assets/images/airport_out.png'; // 黄色背景
 
 // 定义props接收地图实例
 const props = defineProps({
@@ -191,7 +194,7 @@ const exampleVehicleLayers = ref([
     name: '滑入航空器', 
     visible: true, 
     showLabel: true,
-    icon: car1Icon,
+    icon: car1Icon1,
     type: 'aircraft-in',
     layer: null,
     features: [
@@ -356,7 +359,18 @@ function initExampleLayers() {
       // 创建标签内容
       const labelDiv = document.createElement('div');
       labelDiv.className = `custom-label label-${layerConfig.type}`;
-      labelDiv.style.backgroundImage = `url(${labelBg})`;
+      
+      // 根据类型选择背景图片 - 滑入使用黄色背景(airport_out.png)，滑出使用蓝色背景(airport_bg.png)
+      let backgroundImage;
+      if (layerConfig.type === 'aircraft-in') {
+        backgroundImage = airportOutBg; // 滑入航空器背景 - 黄色
+      } else if (layerConfig.type === 'aircraft-out') {
+        backgroundImage = airportBg; // 滑出航空器背景 - 蓝色
+      } else {
+        backgroundImage = labelBg; // 普通车辆背景
+      }
+      
+      labelDiv.style.backgroundImage = `url(${backgroundImage})`;
       labelDiv.style.backgroundRepeat = 'no-repeat';
       labelDiv.style.backgroundSize = '100% 100%';
       labelDiv.style.padding = '3px 10px';
@@ -436,7 +450,7 @@ function selectTextStyle(style) {
   const allLabels = document.querySelectorAll('.custom-label');
   allLabels.forEach(label => {
     // 确保背景图片始终存在
-    label.style.backgroundImage = "url('../../../assets/images/label_bg.png')";
+    label.style.backgroundImage = labelBg;
     label.style.backgroundRepeat = "no-repeat";
     label.style.backgroundSize = "100% 100%";
     
@@ -457,13 +471,13 @@ function selectTextStyle(style) {
       default:
         // 默认样式，恢复原始样式
         if (label.classList.contains('label-aircraft-in')) {
-          // label.style.backgroundColor = 'rgba(52, 122, 226, 0.7)';
-          // label.style.borderColor = '#347AE2';
-          label.style.color = '#fff';
-        } else if (label.classList.contains('label-aircraft-out')) {
           // label.style.backgroundColor = 'rgba(245, 231, 79, 0.7)';
           // label.style.borderColor = '#E4CB0D';
-          label.style.color = '#333';
+          label.style.color = '#333'; // 滑入航空器 - 黄色背景，黑色文字
+        } else if (label.classList.contains('label-aircraft-out')) {
+          // label.style.backgroundColor = 'rgba(52, 122, 226, 0.7)';
+          // label.style.borderColor = '#347AE2';
+          label.style.color = '#fff'; // 滑出航空器 - 蓝色背景，白色文字
         } else if (label.classList.contains('label-car')) {
           // label.style.backgroundColor = 'rgba(37, 37, 37, 0.7)';
           // label.style.borderColor = '#484848';
@@ -513,13 +527,13 @@ function updateAllLabelsStyle(styleName) {
       default:
         // 默认样式，恢复原始样式
         if (isAircraftIn) {
-          // label.style.backgroundColor = 'rgba(52, 122, 226, 0.7)';
-          // label.style.borderColor = '#347AE2';
-          label.style.color = '#fff';
-        } else if (isAircraftOut) {
           // label.style.backgroundColor = 'rgba(245, 231, 79, 0.7)';
           // label.style.borderColor = '#E4CB0D';
-          label.style.color = '#333';
+          label.style.color = '#333'; // 滑入航空器 - 黄色背景，黑色文字
+        } else if (isAircraftOut) {
+          // label.style.backgroundColor = 'rgba(52, 122, 226, 0.7)';
+          // label.style.borderColor = '#347AE2';
+          label.style.color = '#fff'; // 滑出航空器 - 蓝色背景，白色文字
         } else if (isCar) {
           // label.style.backgroundColor = 'rgba(37, 37, 37, 0.7)';
           // label.style.borderColor = '#484848';
@@ -1126,20 +1140,20 @@ function toggleExampleLabel(layer) {
   transform: translateX(-50%);
 }
 
-/* 滑入航空器 */
+/* 滑入航空器 - 黄色背景，黑色文字 */
 .label-aircraft-in {
-  background-color: rgba(52, 122, 226, 0.7);
-  border-color: #347AE2;
-  color: #fff;
-}
-
-/* 滑出航空器 */
-.label-aircraft-out {
   background-color: rgba(245, 231, 79, 0.7);
   border-color: #E4CB0D;
   color: #333;
 }
 
+/* 滑出航空器 - 蓝色背景，白色文字 */
+.label-aircraft-out {
+  background-color: rgba(52, 122, 226, 0.7);
+  border-color: #347AE2;
+  color: #fff;
+}
+
 /* 无人车 */
 .label-car {
   background-color: rgba(37, 37, 37, 0.7);

src/components/map/controls/OpenLayersMapInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="map-info">
-   <!--     <input type="text" readonly :value="xyText" />
+       <input type="text" readonly :value="xyText" />
-    <input type="text" readonly :value="wgs84Text" />  -->
+    <input type="text" readonly :value="wgs84Text" /> 
     <!-- <input type="text" readonly :value="pixelText" /> -->
   </div>
 </template>

src/components/map/controls/OpenLayersZoomControl.vue

@@ -1,35 +1,108 @@
 <template>
   <div class="zoom-control">
-    <LayerSwitcher class="layer-switcher" :map="map" @layerChange="onLayerChange" ref="layerSwitcherRef" />
+    <LayerSwitcher
-    
+      class="layer-switcher"
-    <div class="compass" @click="onCompass"></div>
+      :map="map"
+      @layerChange="onLayerChange"
+      ref="layerSwitcherRef"
+    />
+
+    <div
+      class="compass-container"
+      :style="{ transform: `rotate(${-rotation}deg)` }"
+    >
+      <div class="rotate-left" @click="rotateLeft" title="向右旋转90°"></div>
+  
+      <div class="rotate-right" @click="rotateRight" title="向左旋转90°"></div>
+    </div>
     <div class="zoom-in" @click="onZoomIn"></div>
     <div class="zoom-out" @click="onZoomOut"></div>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, onUnmounted, watch } from "vue";
-import LayerSwitcher from './LayerSwitcher.vue';
+import LayerSwitcher from "./LayerSwitcher.vue";
+
+// 导入图片资源
+import znzBgImg from "../../../assets/images/znzBg.png";
+import needleImg from "../../../assets/images/znz.png";
+import leftArrowImg from "../../../assets/images/left_arrow.png";
+import rightArrowImg from "../../../assets/images/right_arrow.png";
 
 // 定义props接受地图实例
 const props = defineProps({
   map: Object, // 地图实例
   resetView: {
     type: Function,
-    default: null
+    default: null,
-  }
+  },
 });
 
 // 组件引用
 const layerSwitcherRef = ref(null);
 
+// 地图旋转角度 (弧度转换为度)
+const rotation = ref(0);
+
 // 向父组件发出事件
-const emit = defineEmits(['compass', 'zoomIn', 'zoomOut', 'layerChange']);
+const emit = defineEmits([
+  "compass",
+  "zoomIn",
+  "zoomOut",
+  "layerChange",
+  "rotate",
+]);
+
+// 监听地图视图变化，更新旋转角度
+function updateRotation() {
+  if (props.map && props.map.getView()) {
+    // OpenLayers中旋转角度是弧度，转换为度
+    rotation.value = (props.map.getView().getRotation() * 180) / Math.PI;
+  }
+}
+
+// 重置地图旋转
+function resetRotation() {
+  if (props.map) {
+    // 重置旋转为0
+    props.map.getView().animate({
+      rotation: 0,
+      duration: 300,
+    });
+    emit("rotate", 0);
+  }
+}
+
+// 向左旋转地图（逆时针）
+function rotateLeft() {
+  if (props.map) {
+    const currentRotation = props.map.getView().getRotation();
+    const newRotation = currentRotation - Math.PI / 2; // 旋转90度（逆时针）
+    props.map.getView().animate({
+      rotation: newRotation,
+      duration: 300,
+    });
+    emit("rotate", (newRotation * 180) / Math.PI);
+  }
+}
+
+// 向右旋转地图（顺时针）
+function rotateRight() {
+  if (props.map) {
+    const currentRotation = props.map.getView().getRotation();
+    const newRotation = currentRotation + Math.PI / 2; // 旋转90度（顺时针）
+    props.map.getView().animate({
+      rotation: newRotation,
+      duration: 300,
+    });
+    emit("rotate", (newRotation * 180) / Math.PI);
+  }
+}
 
 // 指南针/重置视图
 function onCompass() {
-  emit('compass');
+  emit("compass");
   if (props.resetView) {
     props.resetView();
   } else if (props.map) {
@@ -42,21 +115,76 @@ function onCompass() {
 
 // 放大地图
 function onZoomIn() {
-  emit('zoomIn');
+  emit("zoomIn");
+  if (props.map) {
+    const currentZoom = props.map.getView().getZoom();
+    props.map.getView().animate({
+      zoom: currentZoom + 1,
+      duration: 250,
+    });
+  }
 }
 
 // 缩小地图
 function onZoomOut() {
-  emit('zoomOut');
+  emit("zoomOut");
+  if (props.map) {
+    const currentZoom = props.map.getView().getZoom();
+    props.map.getView().animate({
+      zoom: currentZoom - 1,
+      duration: 250,
+    });
+  }
 }
 
 // 图层变化处理
 function onLayerChange(layerInfo) {
-  console.log('ZoomControl收到图层变化:', layerInfo);
+  console.log("ZoomControl收到图层变化:", layerInfo);
   // 将图层信息传递给父组件
-  emit('layerChange', layerInfo);
+  emit("layerChange", layerInfo);
 }
 
+// 监听地图旋转事件
+let rotationListener = null;
+
+onMounted(() => {
+  if (props.map) {
+    // 初始化旋转角度
+    updateRotation();
+
+    // 添加视图变化监听器
+    rotationListener = props.map
+      .getView()
+      .on("change:rotation", updateRotation);
+  }
+});
+
+onUnmounted(() => {
+  // 移除监听器
+  if (rotationListener) {
+    rotationListener.dispose();
+  }
+});
+
+// 监听地图实例变化
+watch(
+  () => props.map,
+  (newMap) => {
+    if (newMap) {
+      // 初始化旋转角度
+      updateRotation();
+
+      // 移除旧的监听器
+      if (rotationListener) {
+        rotationListener.dispose();
+      }
+
+      // 添加新的视图变化监听器
+      rotationListener = newMap.getView().on("change:rotation", updateRotation);
+    }
+  }
+);
+
 // 导出方法供外部调用
 defineExpose({
   // 设置图层可见性的方法
@@ -65,7 +193,13 @@ defineExpose({
       return layerSwitcherRef.value.setLayerVisibility(layerName, visible);
     }
     return false;
-  }
+  },
+  // 重置旋转
+  resetRotation,
+  // 获取当前旋转角度
+  getRotation() {
+    return rotation.value;
+  },
 });
 </script>
 
@@ -83,15 +217,64 @@ defineExpose({
   gap: 25px;
 }
 
-.compass {
+.compass-container {
+  position: relative;
   width: 40px;
   height: 40px;
-  background: url("../../../assets/images/znz.png") no-repeat;
-  background-size: 100% 100%;
   cursor: pointer;
-  z-index: 3000;
+  background: url("../../../assets/images/znzBg.png") no-repeat;
+  background-size: 100% 100%;
 }
-.layer-switcher{
+
+.rotation-controls {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  z-index: 3002;
+}
+
+.rotate-left,
+.rotate-right {
+  width: 24px;
+  height: 24px;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  cursor: pointer;
+}
+
+.rotate-left {
+  left: -3px;
+  background: url("../../../assets/images/left_arrow.png") no-repeat;
+  background-size: 100% 100%;
+  z-index: 5000;
+}
+
+.rotate-right {
+  right: -3px;
+  background: url("../../../assets/images/right_arrow.png") no-repeat;
+  background-size: 100% 100%;
+}
+
+.rotate-left:hover,
+.rotate-left:active {
+  left: -3px;
+  background: url("../../../assets/images/left_arrow_active.png") no-repeat;
+  background-size: 100% 100%;
+}
+.rotate-right:hover,
+.rotate-right:active {
+  right: -3px;
+  background: url("../../../assets/images/right_arrow_active.png") no-repeat;
+  background-size: 100% 100%;
+}
+
+.layer-switcher {
   z-index: 3000;
   width: 40px;
   height: 40px;
@@ -99,6 +282,11 @@ defineExpose({
   background-size: 100% 100%;
   cursor: pointer;
 }
+.layer-switcher:hover,
+.layer-switcher:active {
+  background: url("../../../assets/images/layerActive.png") no-repeat;
+  background-size: 100% 100%;
+}
 
 .zoom-in {
   background: url("../../../assets/images/zoomOut.png") no-repeat;
@@ -108,6 +296,11 @@ defineExpose({
   height: 40px;
   cursor: pointer;
 }
+.zoom-in:hover,
+.zoom-in:active {
+  background: url("../../../assets/images/zoomOutActive.png") no-repeat;
+  background-size: 100% 100%;
+}
 
 .zoom-out {
   background: url("../../../assets/images/zoomIn.png") no-repeat;
@@ -117,15 +310,43 @@ defineExpose({
   height: 40px;
   cursor: pointer;
 }
+.zoom-out:hover,
+.zoom-out:active {
+  background: url("../../../assets/images/zoomInActive.png") no-repeat;
+  background-size: 100% 100%;
+}
+
 
 /* 响应式调整 */
 @media (max-width: 768px) {
-  .zoom-in, .zoom-out, .compass {
+  .zoom-in,
+  .zoom-out,
+  .compass-container,
+  .compass-bg,
+  .compass-needle {
     width: 28px;
     height: 28px;
+  }
+
+  .zoom-in,
+  .zoom-out {
     background-size: 80%;
     background-position: center center;
     background-repeat: no-repeat;
   }
+
+  .rotate-left,
+  .rotate-right {
+    width: 18px;
+    height: 18px;
+  }
+
+  .rotate-left {
+    left: -18px;
+  }
+
+  .rotate-right {
+    right: -18px;
+  }
 }
-</style> 
+</style>

src/components/map/controls/VehicleMovementControl.vue

@@ -0,0 +1,454 @@
+<template>
+  <div class="vehicle-movement-control">
+    <!-- 连接状态指示器 -->
+    <div class="ws-status" :class="{ connected: wsConnected }">
+      <span v-if="wsConnected">已连接</span>
+      <span v-else>未连接</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, watch } from 'vue';
+import { Vector as VectorSource } from 'ol/source';
+import { Vector as VectorLayer } from 'ol/layer';
+import { Style, Icon } from 'ol/style';
+import Feature from 'ol/Feature';
+import Point from 'ol/geom/Point';
+import Overlay from 'ol/Overlay';
+import { transform } from 'ol/proj';
+
+// 为SockJS提供polyfill
+if (typeof window !== 'undefined' && !window.global) {
+  window.global = window;
+}
+
+
+let SockJS;
+let StompJS;
+
+// 导入车辆图标
+import carIcon from '../../../assets/images/noPeopleCar.png';
+import aircraftIcon from '../../../assets/images/Aircraft.png';
+import aircraft1Icon from '../../../assets/images/Aircraft1.png';
+import labelBg from '../../../assets/images/label_bg.png';
+import airportBg from '../../../assets/images/airport_bg.png';
+import airportOutBg from '../../../assets/images/airport_out.png';
+// 定义props接收地图实例
+const props = defineProps({
+  map: Object
+});
+
+// WebSocket连接状态
+const wsConnected = ref(false);
+let stompClient = null;
+
+// 车辆数据存储
+const vehicles = ref({});
+let vehicleLayer = null;
+let vehicleSource = null;
+
+// 创建车辆图层
+function createVehicleLayer() {
+  if (!props.map) return;
+  
+  // 创建矢量数据源
+  vehicleSource = new VectorSource();
+  
+  // 创建矢量图层
+  vehicleLayer = new VectorLayer({
+    source: vehicleSource,
+    zIndex: 20, // 确保在其他图层之上
+  });
+  
+  // 添加图层到地图
+  props.map.addLayer(vehicleLayer);
+  console.log('车辆移动图层已创建');
+  
+  // 设置地图监听器
+  setupMapListeners();
+}
+
+// 更新车辆位置
+function updateVehiclePosition(vehicleData) {
+  if (!vehicleSource || !props.map) return;
+  
+  const { object_id, object_type, position, heading, speed } = vehicleData;
+  console.log(`接收到位置数据: ${object_id}`, position);
+  
+  // 转换坐标系 (如果需要)
+  // 假设后端发送的是WGS84坐标，需要转换为地图使用的投影
+  let coordinates;
+  try {
+    coordinates = transform(
+      [position.longitude, position.latitude], 
+      'EPSG:4326', 
+      props.map.getView().getProjection()
+    );
+  } catch (e) {
+    console.error('坐标转换失败:', e);
+    coordinates = [position.x || 0, position.y || 0]; // 如果转换失败，尝试使用直接坐标
+  }
+  
+  // 检查该车辆是否已存在
+  let feature = vehicleSource.getFeatureById(object_id);
+  
+  // 判断航空器类型
+  const isAircraftIn = object_type.toLowerCase().includes('aircraft') && !object_id.toLowerCase().includes('ac001');
+  const isAircraftOut = object_id.toLowerCase().includes('ac001');
+  const isAircraft = isAircraftIn || isAircraftOut;
+  
+  // 选择图标 - 根据类型选择不同图标
+  let iconSrc;
+  if (isAircraftIn) {
+    iconSrc = aircraftIcon; // 滑入航空器
+  } else if (isAircraftOut) {
+    iconSrc = aircraft1Icon; // 滑出航空器
+  } else {
+    iconSrc = carIcon; // 普通车辆
+  }
+  
+  // 创建样式
+  const style = new Style({
+    image: new Icon({
+      src: iconSrc,
+      scale: 1.5,
+      anchor: [0.5, 0.5],
+      rotation: heading ? (heading * Math.PI / 180) : 0, // 将角度转换为弧度
+    })
+  });
+  
+  if (!feature) {
+    // 创建新的Feature
+    feature = new Feature({
+      geometry: new Point(coordinates),
+      name: `${object_type} ${object_id}`,
+      type: object_type,
+      speed: speed,
+      isAircraftIn: isAircraftIn,
+      isAircraftOut: isAircraftOut,
+      isAircraft: isAircraft
+    });
+    
+    feature.setId(object_id);
+    feature.setStyle(style);
+    vehicleSource.addFeature(feature);
+    
+    // 存储车辆信息
+    vehicles.value[object_id] = {
+      id: object_id,
+      type: object_type,
+      position: coordinates,
+      heading: heading,
+      speed: speed,
+      feature: feature,
+      isAircraftIn: isAircraftIn,
+      isAircraftOut: isAircraftOut,
+      isAircraft: isAircraft
+    };
+    
+    // 创建标签 - 使用updateVehicleLabel来确保一致性
+    updateVehicleLabel(object_id, coordinates, speed);
+  } else {
+    // 更新现有Feature
+    feature.getGeometry().setCoordinates(coordinates);
+    feature.setStyle(style);
+    
+    // 更新存储的车辆信息
+    vehicles.value[object_id] = {
+      ...vehicles.value[object_id],
+      position: coordinates,
+      heading: heading,
+      speed: speed,
+      isAircraftIn: isAircraftIn,
+      isAircraftOut: isAircraftOut,
+      isAircraft: isAircraft
+    };
+    
+    // 更新标签位置和内容
+    updateVehicleLabel(object_id, coordinates, speed);
+  }
+}
+
+// 更新车辆标签
+function updateVehicleLabel(id, position, speed) {
+  if (!props.map || !vehicles.value[id]) return;
+  
+  console.log(`更新标签位置: ${id}, 位置: [${position[0]}, ${position[1]}]`);
+  
+  // 如果存在旧的overlay，先移除它
+  if (vehicles.value[id].overlay) {
+    props.map.removeOverlay(vehicles.value[id].overlay);
+  }
+  
+  // 获取车辆类型信息
+  const vehicle = vehicles.value[id];
+  const isAircraftIn = vehicle.isAircraftIn;
+  const isAircraftOut = vehicle.isAircraftOut;
+  
+  // 选择背景图片 - 滑入使用黄色背景(airport_out.png)，滑出使用蓝色背景(airport_bg.png)
+  let backgroundImage;
+  if (isAircraftOut) {
+    backgroundImage = airportOutBg; // 滑入航空器背景 - 黄色
+  } else if (isAircraftIn) {
+    backgroundImage = airportBg; // 滑出航空器背景 - 蓝色
+  } else {
+    backgroundImage = labelBg; // 普通车辆背景
+  }
+  
+  // 重新创建标签元素
+  const labelDiv = document.createElement('div');
+  labelDiv.className = `vehicle-label ${isAircraftIn ? 'vehicle-aircraft-in' : ''} ${isAircraftOut ? 'vehicle-aircraft-out' : ''} ${(!isAircraftIn && !isAircraftOut) ? 'vehicle-car' : ''}`;
+  labelDiv.innerHTML = `${id} ${speed} km/h`;
+  labelDiv.style.backgroundImage = `url(${backgroundImage})`;
+  labelDiv.style.backgroundSize = '100% 100%';
+  labelDiv.style.color = '#fff';
+  labelDiv.style.padding = '5px 10px';
+  
+  // 创建新的Overlay
+  const overlay = new Overlay({
+    element: labelDiv,
+    position: position,
+    positioning: 'bottom-center', // 标签底部中心对准位置点
+    offset: [0, -30], // 向上偏移，确保在图标上方
+    stopEvent: false,
+    insertFirst: true, // 确保在DOM中优先插入
+    autoPan: false, // 禁用自动平移
+  });
+  
+  // 更新引用
+  vehicles.value[id].overlay = overlay;
+  vehicles.value[id].labelDiv = labelDiv;
+  
+  // 添加到地图
+  props.map.addOverlay(overlay);
+}
+
+// 监听地图变化，确保标签位置正确更新
+function setupMapListeners() {
+  if (!props.map) return;
+  
+  // 监听地图移动结束事件
+  props.map.on('moveend', () => {
+    // 更新所有标签位置
+    Object.keys(vehicles.value).forEach(id => {
+      const vehicle = vehicles.value[id];
+      if (vehicle.feature) {
+        const coordinates = vehicle.feature.getGeometry().getCoordinates();
+        updateVehicleLabel(id, coordinates, vehicle.speed);
+      }
+    });
+  });
+}
+
+// 连接WebSocket
+function connectWebSocket() {
+  if (!SockJS || !StompJS) {
+    console.error('SockJS或StompJS库未加载');
+    return;
+  }
+
+  try {
+    // 使用SockJS和STOMP客户端创建连接
+    const socket = new SockJS('http://10.0.0.124:8081/ws');
+    stompClient = new StompJS.Client({
+      webSocketFactory: () => socket,
+      connectHeaders: {},
+      debug: function(str) {
+        console.log('STOMP Debug: ' + str);
+      },
+      reconnectDelay: 3000,
+      heartbeatIncoming: 4000,
+      heartbeatOutgoing: 4000,
+    });
+    
+    // 注册事件处理器
+    stompClient.onConnect = (frame) => {
+      console.log('WebSocket连接成功');
+      wsConnected.value = true;
+      
+      // 订阅实时消息主题
+      stompClient.subscribe('/topic/realtime', (message) => {
+        handleWsMessage(message.body);
+      });
+    };
+    
+    stompClient.onStompError = (frame) => {
+      console.error('STOMP错误:', frame.headers['message']);
+      console.error('详细信息:', frame.body);
+      wsConnected.value = false;
+    };
+    
+    stompClient.onWebSocketClose = () => {
+      console.log('WebSocket连接关闭');
+      wsConnected.value = false;
+    };
+    
+    stompClient.onWebSocketError = (error) => {
+      console.error('WebSocket错误:', error);
+      wsConnected.value = false;
+    };
+    
+    // 激活连接
+    stompClient.activate();
+  } catch (error) {
+    console.error('创建WebSocket连接失败:', error);
+  }
+}
+
+ // 处理WebSocket消息
+function handleWsMessage(message) {
+  try {
+    const data = JSON.parse(message);
+    
+    // 根据消息类型处理
+    switch (data.type) {
+      case 'position_update':
+        updateVehiclePosition(data.payload);
+        break;
+      case 'vehicle_command':
+        console.log('收到车辆控制指令:', data.payload);
+        break;
+      default:
+        // 其他类型的消息可以根据需要处理
+        break;
+    }
+  } catch (e) {
+    console.error('处理WebSocket消息出错:', e);
+  }
+}
+
+// 清理资源
+function cleanup() {
+  // 断开WebSocket连接
+  if (stompClient) {
+    stompClient.deactivate();
+    stompClient = null;
+  }
+  
+  // 移除图层
+  if (vehicleLayer && props.map) {
+    props.map.removeLayer(vehicleLayer);
+    vehicleLayer = null;
+  }
+  
+  // 移除标签
+  if (props.map) {
+    Object.values(vehicles.value).forEach(vehicle => {
+      if (vehicle.overlay) {
+        console.log(`移除标签: ${vehicle.id}`);
+        props.map.removeOverlay(vehicle.overlay);
+        vehicle.overlay = null;
+      }
+    });
+  }
+  
+  // 清空车辆数据
+  vehicles.value = {};
+}
+
+// 监听地图实例变化
+watch(() => props.map, (newMap) => {
+  if (newMap) {
+    createVehicleLayer();
+  }
+});
+
+// 组件挂载时初始化
+onMounted(async () => {
+  // 动态加载SockJS和StompJS
+  try {
+    // 如果已经在全局定义了，就直接使用
+    if (window.SockJS) {
+      SockJS = window.SockJS;
+    } else {
+      // 否则尝试动态导入
+      const sockjsModule = await import('sockjs-client');
+      SockJS = sockjsModule.default;
+    }
+    
+    if (window.StompJs) {
+      StompJS = window.StompJs;
+    } else {
+      const stompModule = await import('@stomp/stompjs');
+      StompJS = stompModule;
+    }
+    
+    // 加载完成后创建图层并连接WebSocket
+    if (props.map) {
+      createVehicleLayer();
+    }
+    connectWebSocket();
+  } catch (error) {
+    console.error('加载WebSocket库失败:', error);
+  }
+});
+
+// 组件卸载时清理资源
+onUnmounted(() => {
+  cleanup();
+});
+
+// 向外暴露方法
+defineExpose({
+  updateVehiclePosition,
+  wsConnected
+});
+</script>
+
+<style scoped>
+.vehicle-movement-control {
+  position: absolute;
+  bottom: 20px;
+  right: 20px;
+  z-index: 1000;
+}
+
+.ws-status {
+  padding: 5px 10px;
+  border-radius: 4px;
+  font-size: 12px;
+  background-color: rgba(255, 87, 34, 0.8);
+  color: white;
+  transition: background-color 0.3s ease;
+}
+
+.ws-status.connected {
+  background-color: rgba(76, 175, 80, 0.8);
+}
+
+/* 车辆标签样式 */
+:deep(.vehicle-label) {
+  position: absolute;
+  padding: 4px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  white-space: nowrap;
+  pointer-events: none;
+  transform: translateX(-50%);
+  text-align: center;
+  background-repeat: no-repeat;
+  background-position: center;
+  min-width: 80px;
+  min-height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 30; /* 确保标签在图标上方 */
+  transition: transform 0.3s ease, left 0.3s ease, top 0.3s ease; /* 平滑移动效果 */
+  will-change: transform, left, top; /* 提示浏览器优化这些属性的变化 */
+  bottom: 0; /* 确保标签底部对齐定位点 */
+}
+
+:deep(.vehicle-aircraft-in) {
+  /* 滑入航空器标签特殊样式，如果需要 */
+}
+
+:deep(.vehicle-aircraft-out) {
+  /* 滑出航空器标签特殊样式，如果需要 */
+}
+
+:deep(.vehicle-car) {
+  /* 车辆标签特殊样式，如果需要 */
+}
+</style> 

src/utils/test_websocket.html

@@ -1,388 +1,332 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>WebSocket 测试客户端 - STOMP + SockJS</title>
+    <meta charset="UTF-8">
+    <title>冲突检测WebSocket测试工具</title>
     <style>
         body {
-            font-family: Arial, sans-serif;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            margin: 20px;
+            margin: 0;
+            padding: 20px;
             background-color: #f5f5f5;
         }
         .container {
-            max-width: 1200px;
+            max-width: 800px;
             margin: 0 auto;
             background: white;
-            padding: 20px;
+            border-radius: 10px;
-            border-radius: 8px;
             box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            padding: 20px;
         }
-        h2 {
+        h1 {
             color: #333;
+            text-align: center;
+            margin-bottom: 30px;
+        }
+        .test-section {
+            border: 1px solid #ddd;
+            border-radius: 8px;
+            margin: 20px 0;
+            padding: 20px;
+            background: #fafafa;
+        }
+        .test-section h2 {
+            color: #555;
+            margin-top: 0;
             border-bottom: 2px solid #007bff;
             padding-bottom: 10px;
         }
-        #messages {
+        .control-group {
-            width: 100%;
+            margin: 15px 0;
-            height: 600px;
+            display: flex;
-            overflow-y: auto;
+            align-items: center;
-            border: 1px solid #ddd;
+            gap: 10px;
-            margin: 20px 0;
+            flex-wrap: wrap;
-            padding: 15px;
-            font-family: 'Courier New', monospace;
-            font-size: 12px;
-            background-color: #1e1e1e;
-            color: #fff;
-            border-radius: 4px;
         }
-        .controls {
+        .control-group label {
-            margin: 20px 0;
+            min-width: 120px;
-            text-align: center;
+            font-weight: bold;
         }
-        button {
+        select, input, button {
-            padding: 10px 20px;
+            padding: 8px 12px;
-            margin: 0 10px;
+            border: 1px solid #ccc;
-            border: none;
             border-radius: 4px;
-            cursor: pointer;
             font-size: 14px;
         }
-        .connect-btn {
+        button {
-            background-color: #28a745;
+            background: #007bff;
-            color: white;
-        }
-        .disconnect-btn {
-            background-color: #dc3545;
-            color: white;
-        }
-        .clear-btn {
-            background-color: #6c757d;
             color: white;
+            border: none;
+            cursor: pointer;
+            transition: background 0.3s;
         }
         button:hover {
-            opacity: 0.8;
+            background: #0056b3;
         }
         button:disabled {
-            opacity: 0.5;
+            background: #6c757d;
             cursor: not-allowed;
         }
         .status {
             padding: 10px;
+            border-radius: 5px;
             margin: 10px 0;
-            border-radius: 4px;
-            text-align: center;
             font-weight: bold;
         }
         .status.connected {
-            background-color: #d4edda;
+            background: #d4edda;
             color: #155724;
             border: 1px solid #c3e6cb;
         }
         .status.disconnected {
-            background-color: #f8d7da;
+            background: #f8d7da;
             color: #721c24;
             border: 1px solid #f5c6cb;
         }
-        .message-stats {
+        .log-container {
-            display: flex;
+            border: 1px solid #ddd;
-            justify-content: space-around;
-            margin: 20px 0;
-            padding: 15px;
-            background-color: #f8f9fa;
             border-radius: 4px;
-        }
+            height: 300px;
-        .stat-item {
+            overflow-y: auto;
-            text-align: center;
+            padding: 10px;
-        }
+            background: white;
-        .stat-number {
+            font-family: 'Consolas', 'Monaco', monospace;
-            font-size: 24px;
-            font-weight: bold;
-            color: #007bff;
-        }
-        .stat-label {
             font-size: 12px;
-            color: #6c757d;
         }
-        
+        .log-entry {
-        /* 消息类型样式 */
+            margin: 2px 0;
-        .error { color: #ff6b6b; }
+            padding: 2px 5px;
-        .success { color: #51cf66; }
+            border-radius: 3px;
-        .info { color: #74c0fc; }
+        }
-        .position { color: #ffd43b; }
+        .log-info { background: #f8f9fa; }
-        .warning { color: #ff8c42; }
+        .log-success { background: #d4edda; color: #155724; }
-        .command { color: #da77f2; }
+        .log-error { background: #f8d7da; color: #721c24; }
-        .traffic-light { color: #69db7c; }
+        .log-warning { background: #fff3cd; color: #856404; }
-        .collision { color: #ff6b6b; font-weight: bold; }
-        .system { color: #91a7ff; }
     </style>
-    <!-- 引入SockJS和STOMP客户端库 -->
-    <script src="https://cdn.jsdelivr.net/npm/sockjs-client@1.6.1/dist/sockjs.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@stomp/stompjs@7.0.0/bundles/stomp.umd.min.js"></script>
 </head>
 <body>
     <div class="container">
-        <h2>WebSocket 实时消息测试客户端</h2>
+        <h1>冲突检测WebSocket测试工具</h1>
-        <p><strong>连接地址:</strong> http://10.0.0.124:8082/ws</p>
-        <p><strong>订阅主题:</strong> /topic/realtime</p>
         
-        <div id="status" class="status disconnected">未连接</div>
+        <!-- 冲突检测WebSocket测试 -->
-        
+        <div class="test-section">
-        <div class="controls">
+            <h2>🚗 冲突检测WebSocket (原生协议)</h2>
-            <button id="connectBtn" class="connect-btn" onclick="connect()">连接</button>
+            
-            <button id="disconnectBtn" class="disconnect-btn" onclick="disconnect()" disabled>断开</button>
+            <div class="control-group">
-            <button class="clear-btn" onclick="clearMessages()">清空日志</button>
+                <label>服务器地址：</label>
-        </div>
+                <select id="collisionServerSelect">
-        
+                    <option value="ws://10.0.0.124:8080/collision">冲突检测WebSocket</option>
-        <div class="message-stats">
+                </select>
-            <div class="stat-item">
-                <div id="totalMessages" class="stat-number">0</div>
-                <div class="stat-label">总消息数</div>
             </div>
-            <div class="stat-item">
+            
-                <div id="positionMessages" class="stat-number">0</div>
+            <div class="control-group">
-                <div class="stat-label">位置更新</div>
+                <button id="collisionConnectBtn" onclick="connectCollisionWebSocket()">连接</button>
+                <button id="collisionDisconnectBtn" onclick="disconnectCollisionWebSocket()" disabled>断开</button>
+                <button onclick="sendCollisionPing()">发送心跳</button>
+                <button onclick="sendCollisionSubscribe()">订阅消息</button>
             </div>
-            <div class="stat-item">
+            
-                <div id="warningMessages" class="stat-number">0</div>
+            <div class="status disconnected" id="collisionStatus">状态：未连接</div>
-                <div class="stat-label">预警消息</div>
+            
-            </div>
+            <div>
-            <div class="stat-item">
+                <h4>日志：</h4>
-                <div id="commandMessages" class="stat-number">0</div>
+                <div class="log-container" id="collisionLog"></div>
-                <div class="stat-label">控制指令</div>
             </div>
         </div>
         
-        <div id="messages"></div>
+        <!-- 控制面板 -->
+        <div class="test-section">
+            <h2>🎛️ 控制面板</h2>
+            <div class="control-group">
+                <button onclick="clearLogs()">清空日志</button>
+                <button onclick="showConnectionStatus()">显示连接状态</button>
+                <button onclick="performStressTest()">压力测试</button>
+            </div>
+        </div>
     </div>
 
     <script>
-        let stompClient = null;
+        // 全局变量
-        const messagesDiv = document.getElementById('messages');
+        let collisionWebSocket = null;
-        const statusDiv = document.getElementById('status');
+        let reconnectAttempts = 0;
-        const connectBtn = document.getElementById('connectBtn');
+        const maxReconnectAttempts = 5;
-        const disconnectBtn = document.getElementById('disconnectBtn');
-        
-        // 消息计数器
-        let messageStats = {
-            total: 0,
-            position_update: 0,
-            collision_warning: 0,
-            vehicle_command: 0,
-            traffic_light_status: 0,
-            system_alert: 0
-        };
 
-        function updateStats() {
+        // 通用日志函数
-            document.getElementById('totalMessages').textContent = messageStats.total;
+        function log(containerId, message, type = 'info') {
-            document.getElementById('positionMessages').textContent = messageStats.position_update;
+            const container = document.getElementById(containerId);
-            document.getElementById('warningMessages').textContent = messageStats.collision_warning;
+            const timestamp = new Date().toLocaleTimeString();
-            document.getElementById('commandMessages').textContent = messageStats.vehicle_command;
+            const entry = document.createElement('div');
+            entry.className = `log-entry log-${type}`;
+            entry.innerHTML = `[${timestamp}] ${message}`;
+            container.appendChild(entry);
+            container.scrollTop = container.scrollHeight;
         }
 
-        function log(message, type = 'info') {
+        // 更新连接状态
-            const div = document.createElement('div');
+        function updateStatus(statusId, connected, message = '') {
-            div.className = type;
+            const statusDiv = document.getElementById(statusId);
-            div.innerHTML = `<span style="color: #888;">[${new Date().toLocaleTimeString()}]</span> ${message}`;
+            statusDiv.className = `status ${connected ? 'connected' : 'disconnected'}`;
-            messagesDiv.appendChild(div);
+            statusDiv.textContent = `状态：${connected ? '已连接' : '未连接'}${message ? ' - ' + message : ''}`;
-            messagesDiv.scrollTop = messagesDiv.scrollHeight;
         }
 
-        function clearMessages() {
+        // =================== 冲突检测WebSocket ===================
-            messagesDiv.innerHTML = '';
+        function connectCollisionWebSocket() {
-            messageStats = {
+            if (collisionWebSocket && collisionWebSocket.readyState === WebSocket.OPEN) {
-                total: 0,
+                log('collisionLog', 'WebSocket已经连接', 'warning');
-                position_update: 0,
-                collision_warning: 0,
-                vehicle_command: 0,
-                traffic_light_status: 0,
-                system_alert: 0
-            };
-            updateStats();
-        }
-
-        function updateConnectionStatus(connected) {
-            if (connected) {
-                statusDiv.textContent = '已连接';
-                statusDiv.className = 'status connected';
-                connectBtn.disabled = true;
-                disconnectBtn.disabled = false;
-            } else {
-                statusDiv.textContent = '未连接';
-                statusDiv.className = 'status disconnected';
-                connectBtn.disabled = false;
-                disconnectBtn.disabled = true;
-            }
-        }
-
-        function connect() {
-            if (stompClient && stompClient.connected) {
-                log('已经连接，请先断开', 'error');
                 return;
             }
 
+            const serverUrl = document.getElementById('collisionServerSelect').value;
+            log('collisionLog', `连接到: ${serverUrl}`, 'info');
+
             try {
-                // 创建SockJS连接
+                collisionWebSocket = new WebSocket(serverUrl);
-                const socket = new SockJS('http://10.0.0.124:8081/ws');
-                stompClient = new StompJs.Client({
-                    webSocketFactory: () => socket,
-                    connectHeaders: {},
-                    debug: function (str) {
-                        console.log('STOMP Debug: ' + str);
-                    },
-                    reconnectDelay: 5000,
-                    heartbeatIncoming: 4000,
-                    heartbeatOutgoing: 4000,
-                });
 
-                stompClient.onConnect = function (frame) {
+                collisionWebSocket.onopen = function(event) {
-                    log('WebSocket连接成功!', 'success');
+                    log('collisionLog', '冲突检测WebSocket连接成功!', 'success');
-                    log('Frame: ' + frame, 'info');
+                    updateStatus('collisionStatus', true, '冲突检测');
-                    updateConnectionStatus(true);
+                    document.getElementById('collisionConnectBtn').disabled = true;
+                    document.getElementById('collisionDisconnectBtn').disabled = false;
+                    reconnectAttempts = 0;
+                };
+
+                collisionWebSocket.onmessage = function(event) {
+                    log('collisionLog', `收到消息: ${event.data}`, 'success');
+                    try {
+                        const message = JSON.parse(event.data);
+                        handleCollisionMessage(message);
+                    } catch (e) {
+                        log('collisionLog', `非JSON消息: ${event.data}`, 'info');
+                    }
+                };
+
+                collisionWebSocket.onerror = function(error) {
+                    log('collisionLog', `连接错误: ${error}`, 'error');
+                    updateStatus('collisionStatus', false);
+                };
+
+                collisionWebSocket.onclose = function(event) {
+                    log('collisionLog', `连接关闭: ${event.code} - ${event.reason}`, 'warning');
+                    updateStatus('collisionStatus', false);
+                    document.getElementById('collisionConnectBtn').disabled = false;
+                    document.getElementById('collisionDisconnectBtn').disabled = true;
                     
-                    // 订阅实时消息主题
+                    // 自动重连
-                    stompClient.subscribe('/topic/realtime', function (message) {
+                    if (reconnectAttempts < maxReconnectAttempts) {
-                        handleMessage(message);
+                        reconnectAttempts++;
-                    });
+                        log('collisionLog', `尝试重连 (${reconnectAttempts}/${maxReconnectAttempts})`, 'info');
-                    
+                        setTimeout(connectCollisionWebSocket, 3000);
-                    log('已订阅主题: /topic/realtime', 'success');
+                    }
                 };
 
-                stompClient.onStompError = function (frame) {
-                    log('STOMP错误: ' + frame.headers['message'], 'error');
-                    log('详细信息: ' + frame.body, 'error');
-                    updateConnectionStatus(false);
-                };
-
-                stompClient.onWebSocketClose = function (event) {
-                    log('WebSocket连接关闭', 'info');
-                    updateConnectionStatus(false);
-                };
-
-                stompClient.onWebSocketError = function (error) {
-                    log('WebSocket错误: ' + error, 'error');
-                    updateConnectionStatus(false);
-                };
-
-                // 激活连接
-                stompClient.activate();
-                log('正在连接到 ws://10.0.0.124:8082/ws ...', 'info');
-
             } catch (error) {
-                log('连接失败: ' + error.message, 'error');
+                log('collisionLog', `连接失败: ${error.message}`, 'error');
-                updateConnectionStatus(false);
+                updateStatus('collisionStatus', false);
             }
         }
 
-        function disconnect() {
+        function disconnectCollisionWebSocket() {
-            if (!stompClient) {
+            if (collisionWebSocket) {
-                log('未连接', 'error');
+                collisionWebSocket.close();
-                return;
+                collisionWebSocket = null;
-            }
+                log('collisionLog', '主动断开连接', 'info');
-
+                reconnectAttempts = maxReconnectAttempts;
-            stompClient.deactivate();
-            stompClient = null;
-            log('连接已断开', 'info');
-            updateConnectionStatus(false);
-        }
-
-        function handleMessage(message) {
-            try {
-                const data = JSON.parse(message.body);
-                messageStats.total++;
-                
-                if (messageStats[data.type]) {
-                    messageStats[data.type]++;
-                }
-                
-                updateStats();
-                
-                // 根据消息类型进行不同的处理和显示
-                switch (data.type) {
-                    case 'position_update':
-                        handlePositionUpdate(data);
-                        break;
-                    case 'collision_warning':
-                        handleCollisionWarning(data);
-                        break;
-                    case 'vehicle_command':
-                        handleVehicleCommand(data);
-                        break;
-                    case 'intersection_traffic_light_status':
-                        handleTrafficLightStatus(data);
-                        break;
-                    case 'system_alert':
-                        handleSystemAlert(data);
-                        break;
-                    default:
-                        log('收到未知类型消息: ' + JSON.stringify(data, null, 2), 'info');
-                }
-            } catch (e) {
-                log('消息解析错误: ' + e.message + ', 原始消息: ' + message.body, 'error');
             }
         }
 
-        function handlePositionUpdate(data) {
+        function sendCollisionPing() {
-            const payload = data.payload;
+            if (collisionWebSocket && collisionWebSocket.readyState === WebSocket.OPEN) {
-            log(`<strong>位置更新</strong> | 对象: ${payload.object_id} (${payload.object_type}) | ` +
+                collisionWebSocket.send('ping');
-                `位置: (${payload.position?.latitude?.toFixed(6)}, ${payload.position?.longitude?.toFixed(6)}) | ` +
+                log('collisionLog', '发送心跳: ping', 'info');
-                `航向: ${payload.heading}° | 速度: ${payload.speed} km/h`, 'position');
+            } else {
+                log('collisionLog', 'WebSocket未连接', 'error');
+            }
         }
 
-        function handleCollisionWarning(data) {
+        function sendCollisionSubscribe() {
-            const payload = data.payload;
+            if (collisionWebSocket && collisionWebSocket.readyState === WebSocket.OPEN) {
-            log(`<strong>🚨 碰撞预警!</strong> | 对象1: ${payload.object1_id} (${payload.object1_type}) | ` +
+                const message = JSON.stringify({
-                `对象2: ${payload.object2_id} (${payload.object2_type}) | ` +
+                    type: 'subscribe',
-                `风险等级: <strong>${payload.risk_level}</strong> | 距离: ${payload.distance}m | ` +
+                    topics: ['position_update', 'collision_warning', 'rule_violation'],
-                `预计时间: ${payload.estimated_time}s`, 'collision');
+                    timestamp: Date.now()
+                });
+                collisionWebSocket.send(message);
+                log('collisionLog', '发送订阅请求', 'info');
+            } else {
+                log('collisionLog', 'WebSocket未连接', 'error');
+            }
         }
 
-        function handleVehicleCommand(data) {
+        function handleCollisionMessage(message) {
-            const payload = data.payload;
+            switch (message.type) {
-            const commandTypes = {
+                case 'connection':
-                'SIGNAL': '🚥 信号灯',
+                    log('collisionLog', `连接确认: ${message.message}`, 'success');
-                'ALERT': '⚠️ 告警',
+                    break;
-                'WARNING': '⚠️ 预警',
+                case 'pong':
-                'RESUME': '✅ 恢复',
+                    log('collisionLog', '心跳响应', 'success');
-                'PARKING': '🅿️ 停车'
+                    break;
-            };
+                case 'position_update':
-            const reasons = {
+                    // 修复：使用正确的字段名 object_id 而不是 vehicleId
-                'TRAFFIC_LIGHT': '红绿灯控制',
+                    const objectId = message.payload?.object_id || '未知';
-                'AIRCRAFT_CROSSING': '航空器交叉',
+                    const objectType = message.payload?.object_type || '';
-                'COLLISION_WARNING': '碰撞预警',
+                    log('collisionLog', `位置更新: ${objectId} (${objectType})`, 'info');
-                'SPECIAL_VEHICLE': '特勤车辆',
+                    break;
-                'AIRCRAFT_PUSH': '航空器推出',
+                case 'collision_warning':
-                'RESUME_TRAFFIC': '恢复通行',
+                    log('collisionLog', `碰撞预警: ${message.payload?.message || JSON.stringify(message.payload)}`, 'error');
-                'PARKING_SIDE': '安全停车'
+                    break;
-            };
+                case 'rule_violation':
+                    log('collisionLog', `规则违规: ${message.payload?.ruleType || '未知规则'}`, 'warning');
+                    break;
+                case 'rule_execution_status':
+                    log('collisionLog', `规则执行状态: ${message.payload?.status || '未知状态'}`, 'info');
+                    break;
+                case 'rule_state_change':
+                    log('collisionLog', `规则状态变更: ${message.payload?.newState || '未知状态'}`, 'info');
+                    break;
+                case 'vehicle_command':
+                    log('collisionLog', `车辆指令: ${message.payload?.commandType || '未知指令'}`, 'info');
+                    break;
+                case 'traffic_light_status':
+                    log('collisionLog', `红绿灯状态: ${message.payload?.intersection_id || '未知路口'}`, 'info');
+                    break;
+                default:
+                    log('collisionLog', `未知消息类型: ${message.type}`, 'info');
+            }
+        }
+
+        // =================== 控制面板 ===================
+        function clearLogs() {
+            document.getElementById('collisionLog').innerHTML = '';
+            log('collisionLog', '日志已清空', 'info');
+        }
+
+        function showConnectionStatus() {
+            const collisionStatus = collisionWebSocket ? 
+                (collisionWebSocket.readyState === WebSocket.OPEN ? '已连接' : '未连接') : '未初始化';
             
-            log(`<strong>车辆控制指令</strong> | 车辆: ${payload.vehicleId} | ` +
+            log('collisionLog', `冲突检测WebSocket: ${collisionStatus}`, 'info');
-                `指令: ${commandTypes[payload.commandType] || payload.commandType} | ` +
-                `原因: ${reasons[payload.reason] || payload.reason} | ` +
-                `描述: ${payload.description || '无'}`, 'command');
         }
 
-        function handleTrafficLightStatus(data) {
+        function performStressTest() {
-            const payload = data.payload;
+            log('collisionLog', '开始压力测试...', 'info');
-            log(`<strong>🚦 红绿灯状态</strong> | 路口: ${payload.intersection_id} | ` +
+            
-                `南北: ${payload.ns_status} | 东西: ${payload.ew_status}`, 'traffic-light');
+            for (let i = 0; i < 10; i++) {
+                setTimeout(() => {
+                    if (collisionWebSocket && collisionWebSocket.readyState === WebSocket.OPEN) {
+                        collisionWebSocket.send(`ping_${i}`);
+                    }
+                }, i * 100);
+            }
         }
 
-        function handleSystemAlert(data) {
+        // 页面加载完成
-            const payload = data.payload;
-            log(`<strong>⚠️ 系统告警</strong> | ${payload.alert_level} | ${payload.title} | ` +
-                `组件: ${payload.component} | 描述: ${payload.description}`, 'system');
-        }
-
-        // 页面加载完成后的初始化
         window.onload = function() {
-            log('WebSocket测试客户端已就绪', 'success');
+            log('collisionLog', '冲突检测WebSocket测试就绪', 'info');
-            log('请点击"连接"按钮开始测试', 'info');
         };
 
-        // 页面关闭时自动断开连接
+        // 页面关闭时清理连接
         window.onbeforeunload = function() {
-            if (stompClient && stompClient.connected) {
+            if (collisionWebSocket) collisionWebSocket.close();
-                disconnect();
-            }
         };
     </script>
 </body>

src/utils/websocket使用说明.md

@@ -1,65 +0,0 @@
-# WebSocket 使用说明
-
-## 1. 引入 WebSocket 工具
-```js
-import { createWebSocket } from '@/utils/websocket';
-```
-
-## 2. 创建 WebSocket 实例
-```js
-const ws = createWebSocket('ws://你的后端ws地址');
-```
-
-## 3. 监听事件
-```js
-// 连接成功
-ws.on('open', () => {
-  console.log('WebSocket 已连接');
-});
-
-// 接收消息
-ws.on('message', (data) => {
-  console.log('收到消息:', data);
-  // 这里可以处理接收到的数据
-});
-
-// 监听错误
-ws.on('error', (err) => {
-  console.error('WebSocket 错误:', err);
-});
-
-// 监听关闭
-ws.on('close', () => {
-  console.log('WebSocket 已关闭');
-});
-```
-
-## 4. 发送数据
-```js
-// 发送对象（会自动转为 JSON 字符串）
-ws.send({ type: 'yourType', payload: '你的数据' });
-
-// 发送字符串
-ws.send('hello server');
-```
-
-## 5. 关闭连接
-建议在页面销毁时关闭 WebSocket 连接：
-```js
-import { onUnmounted } from 'vue';
-
-onUnmounted(() => {
-  ws.close();
-});
-```
-
-## 6. 其他说明
-- 支持自动重连，默认最大重连 10 次，每次间隔 3 秒。
-- 支持事件解绑：
-```js
-ws.off('message', callback);
-```
-- 支持多页面/组件复用，内部采用单例模式。
-
----
-如需更复杂的用法或有特殊需求，请联系开发维护者。 

src/views/platform/index.vue

@@ -20,6 +20,11 @@
     <!-- 车辆列表 -->
     <Eventlist v-if="showEventList" />
  
+    <!-- 车辆移动控制组件 -->
+    <VehicleMovementControl :map="map" ref="vehicleMovementRef" v-if="map" />
+    
+
+
     <!-- 绘制工具栏 -->
   <!--  <div class="draw-toolbar">
       <div class="toolbar-title">绘制工具</div>
@@ -36,11 +41,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue';
+import { ref, onMounted, onUnmounted, watch } from 'vue';
 import OpenLayersMap from '../../components/map/OpenLayersMap.vue';
 import CarAlarm from '../../components/map/info/carClarm.vue';
 import Eventlist from '../../components/map/info/eventlist.vue';
 import AlarmNotification from '../../components/map/info/AlarmNotification.vue';
+import VehicleMovementControl from '../../components/map/controls/VehicleMovementControl.vue';
 import btn_left from '../../assets/images/btn_left.png';
 import btn_right from '../../assets/images/btn_right.png';
 
@@ -48,6 +54,11 @@ const showEventList = ref(false); // 默认不显示列表
 const showAlarmPanel = ref(false); // 默认不显示报警面板
 const alarmCount = ref(4); // 报警数量
 const mapRef = ref(null);
+const vehicleMovementRef = ref(null);
+const map = ref(null); // 存储地图实例
+
+// 判断是否为开发环境
+const isDevelopment = process.env.NODE_ENV === 'development';
 
 function toggleEventList() {
   showEventList.value = !showEventList.value;
@@ -94,12 +105,35 @@ function importRouteData() {
   }
 }
 
+
+
 onMounted(() => {
   document.querySelector('.app-main')?.classList.add('platform-no-padding');
+  
+  // 获取地图实例
+  if (mapRef.value) {
+    // 等待地图实例初始化完成
+    setTimeout(() => {
+      map.value = mapRef.value.map;
+      console.log('地图实例已获取:', map.value);
+      
+      // 可以在这里启动测试
+      // testVehicleMovement();
+    }, 1000);
+  }
 });
+
 onUnmounted(() => {
   document.querySelector('.app-main')?.classList.remove('platform-no-padding');
 });
+
+// 监听地图实例引用变化
+watch(() => mapRef.value?.map, (newMap) => {
+  if (newMap) {
+    map.value = newMap;
+    console.log('地图实例已更新:', map.value);
+  }
+});
 </script>
 
 <style scoped lang="scss">
@@ -173,6 +207,31 @@ onUnmounted(() => {
   right: 405px; 
 }
 
+/* 测试按钮 - 仅开发阶段使用 */
+.test-controls {
+  position: absolute;
+  bottom: 20px;
+  left: 20px;
+  z-index: 2000;
+}
+
+.test-btn {
+  padding: 8px 16px;
+  background-color: rgba(33, 150, 243, 0.8);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  transition: all 0.3s ease;
+}
+
+.test-btn:hover {
+  background-color: rgba(33, 150, 243, 1);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
+}
+
 /* 绘制工具栏 */
 .draw-toolbar {
   position: absolute;

src/views/system/role/index.vue

@@ -215,7 +215,7 @@ function getList() {
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
-}
+} 
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = [];