Merge branch 'feixian' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo into feixian

src/views/gridman/forestranger/widget/ditu.vue

@@ -14,13 +14,13 @@ export default {
     return {
       map: null,
       clockInList: [],
-      markerArr:[]
+      markerArr: [],
     };
   },
   watch: {
     rowkey: function (e) {
-      console.log('123',e)
-      this.getClockInList()
+      console.log("123", e);
+      this.getClockInList();
     },
     lnglat: function (e) {},
     flyCenter: function (e) {
@@ -45,13 +45,13 @@ export default {
       getMethodCommon("/FireGrid/GetTotalCheckPoint").then((res) => {
         this.clockInList = res.result;
         for (var i = this.markerArr.length - 1; i >= 0; i--) {
-            this.markerArr[i].remove();
+          this.markerArr[i].remove();
         }
         this.addPointLayer();
       });
     },
     addPointLayer() {
-      let _this = this
+      let _this = this;
       this.clockInList.forEach((item) => {
         console.log("iii", item);
         let el = document.createElement("img"); //这里可以是任意标签
@@ -63,11 +63,15 @@ export default {
         //   console.log('123item',item)
         //   _this.$emit("editClock",item)
         // }
-        
+        console.log(item)
+        const popup = new mapboxgl.Popup({ offset: 25 }).setHTML(`${item.pointname }<br />${item.usernames}`);
         // 添加自定义标记点
-        let marker = new mapboxgl.Marker(el).setLngLat([item.lng, item.lat]).addTo(this.map);
-        this.markerArr.push(marker)
-
+        let marker = new mapboxgl.Marker(el)
+          .setLngLat([item.lng, item.lat])
+          .setPopup(popup)
+          .addTo(this.map);
+          marker
+        this.markerArr.push(marker);
       });
     },
     initMap(url, jwd) {
@@ -91,6 +95,9 @@ export default {
       this.map.on("click", (e) => {
         this.$emit("getLocation", e);
       });
+      this.map.on("contextmenu", (e) => {
+        this.$emit("rightClick", e);
+      });
     },
 
     loadMengban() {