绘制内容结算0119

src/components/mapJK.vue

@@ -1486,7 +1486,10 @@ export default {
                         type:"conflict",
                         action:message.routeInfoVO.avoidanceType,
                         data:message.routeInfoVO.avoidanceType == "wait" ?message.nearestAircraft:message.routeInfoVO,
-                        origin:message.routeInfoVO
+                        origin:{
+                          ...message.nearestAircraft,
+                          ...message.routeInfoVO
+                        }
                       }
                     });
                     addGraphics({
@@ -1544,7 +1547,10 @@ export default {
                           type:"routeDeviate",
                           data:message.routeDeviate,
                           index:message.index,
-                          origin:message.routeInfoVO
+                          origin:{
+                            ...message.routeDeviate,
+                            ...message.routeInfoVO
+                          }
                         }
                       });
                     }