Merge branch 'develop_jzl'

gassafetyprogress-web/src/components/bigWindow/Null.vue

+<!--
+ * @Author: your name
+ * @Date: 2022-03-22 10:31:50
+ * @LastEditTime: 2022-03-22 10:31:51
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /gassafety-progress/gassafetyprogress-web/src/components/bigWindow/Nulll.vue
+-->
+<template>
+  
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

gassafetyprogress-web/src/utils/mapClass/map.js

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2022-03-21 18:13:58
+ * @LastEditTime: 2022-03-22 10:35:13
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/mapClass.js
@@ -682,7 +682,7 @@ export class EditorMap {
    * @param {*} path 轨迹回访率丼
    * @return {*}
    */
-  backTrack(vehicleId, path, times) {
+  backTrack(vehicleId, path, times,component) {
     this.infowindowClose();
 
     AMap.plugin("AMap.MoveAnimation", () => {
@@ -718,7 +718,7 @@ export class EditorMap {
       //点击的时候，先传进来一个点
       const carPathData = { ...marker.getExtData(), time: times[0] };
       carPathData.iconType = 14;
-      this.addDevice(carPathData, null);
+      this.addDevice(carPathData,component);
       // marker.pointArr.push(point);
 
       marker.on("moveend", (e) => {
@@ -734,7 +734,7 @@ export class EditorMap {
         // if (e.index == path.length - 1) {
         //  point = this.addDevice(z, null);
         // } else {
-        this.addDevice(z, null);
+        this.addDevice(z,component);
         // workPoint.infoWindow.open(map,e.passedPos);
         // }
         console.log("定点", e);

gassafetyprogress-web/src/views/operationMonitor/gassVehicle/index.vue

@@ -210,6 +210,7 @@ import MapCar from "./component/MapCar";
 import { EditorMap } from "@/utils/mapClass/map";
 import { mapGetters, mapActions } from "vuex";
 import drawer from  "./component/drawer";
+import NullVUe from  "@/components/bigWindow/Null";
 import moment from "moment";
 export default {
   name: "vechicle",
@@ -440,16 +441,14 @@ export default {
                   paths.push([item.longitude,item.latitude]);
                   times.push(item.reportTime)
               })
-                this.map.backTrack(this.backForm.vehicleId,paths,times);
+                this.map.backTrack(this.backForm.vehicleId,paths,times,NullVUe);
                 this.backOpen = false;
             }
 
           })
 
         }
-
       });
-
     },
     sleep (time) {
       return new Promise((resolve) => setTimeout(resolve, time));