Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -323,10 +323,9 @@ export default {
       // 更新数据时再标记
       if(type==2){
         this.addMarker(); //标记
+        this.createLineHandler(); //连线
+        await this.addCountriesMaker(); //标记国家
       }
-      this.createLineHandler(); //连线
-      await this.addCountriesMaker(); //标记国家
-
       //this.addDocumentEventListener();
     },
 
@@ -827,24 +826,28 @@ export default {
               }
             ]
           };
-          that.map&&that.map.addSource("curve-source-" + p.MId, {
-            type: "geojson",
-            data: geojson
-          });
-          that.map&&that.map.addLayer({
-            id: "curve-layer-" + p.MId,
-            type: "line",
-            source: "curve-source-" + p.MId,
-            layout: {
-              "line-cap": "round",
-              "line-join": "round"
-            },
-            paint: {
-              "line-color": ["rgba", 0, 0, 0, 0.3],
-              "line-width": 1.5
-              //'line-dasharray': [2, 4],
+          setTimeout(()=>{
+            if(this.map&&!this.map.getLayer("curve-layer-" + p.MId)){
+              that.map&&that.map.addSource("curve-source-" + p.MId, {
+                type: "geojson",
+                data: geojson
+              });
+              that.map&&that.map.addLayer({
+                id: "curve-layer-" + p.MId,
+                type: "line",
+                source: "curve-source-" + p.MId,
+                layout: {
+                  "line-cap": "round",
+                  "line-join": "round"
+                },
+                paint: {
+                  "line-color": ["rgba", 0, 0, 0, 0.3],
+                  "line-width": 1.5
+                  //'line-dasharray': [2, 4],
+                }
+              });
             }
-          });
+          },300)
         }
       });
     },