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

src/App.vue

@@ -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);
+    }
   }
 }