Merge branch 'main' of ssh://git.wash-painting.cn:2222/cg/-----

src/App.vue

@@ -283,7 +283,7 @@ import { ref, onMounted, onUnmounted, computed } from 'vue'
 import AMapLoader from '@amap/amap-jsapi-loader'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { WebSocketClient, MockWebSocketDataGenerator } from './utils/websocket.js'
-import droneImage from './assets/image/wrj.png'
+import droneImage from './assets/image/wrj2.png'
 import icon1 from './assets/image/1.png'
 import icon2 from './assets/image/2.png'
 import icon3 from './assets/image/3.png'
@@ -505,7 +505,7 @@ const handleTakeoff = () => {
   ctrl.TakeoffAndAutoExecTask({});
 
   // 设置飞行状态
-  isFlying.value = true
+  // isFlying.value = true
   ElMessage.success('无人机已起飞')
 }
 
@@ -544,10 +544,18 @@ const toggleWebSocket = () => {
         gcoord.WGS84,       // 当前坐标系
         gcoord.GCJ02,       // 目标坐标系
       );
-      console.log(point, point2);
+      // console.log(point, point2);
       updateDroneMarker(point[0], point[1], point2[0], point2[1], drone1.heading);
       // updateDrone2Marker(point2[0], point2[1], drone2.heading);
     };
+    conn.onFirePointGPS = (data) => {
+      const point = gcoord.transform(
+        [data.longitude, data.latitude],
+        gcoord.WGS84,       // 当前坐标系
+        gcoord.GCJ02,       // 目标坐标系
+      );
+      console.log('Fire GPS: ', point);
+    }
   }
 }