bihuisong 10 ay önce
ebeveyn
işleme
3d2a1e9464

+ 18 - 2
zhsq_qk-ui/src/views/fusion/aqyj.vue

@@ -219,10 +219,26 @@ export default {
     handleClick() {
       this.$refs.supermap.clearM()
       let markType = [];
+      let that = this;
       $('input[name="ckbx"]:checked').each(function () {
-        markType.push($(this).attr("id"))
+        // markType.push($(this).attr("id"))
+        switch ($(this).attr("id")){
+          case "sxt": that.loada();break;
+          case "yjcs": that.loadb();break;
+          case "jyd": that.loadc();break;
+          case "fxwz": console.log('4444');
+        }
       });
-      this.$refs.supermap.init(markType)
+      // this.$refs.supermap.init(markType)
+    },
+    loada() {
+      this.$refs.supermap.selectCameraList();
+    },
+    loadb() {
+      this.$refs.supermap.selectQkEmergencyShelterAllList();
+    },
+    loadc() {
+      this.$refs.supermap.selectQkEmergencyRescueTeamAllList();
     },
     onTeamlick(val) {
       let markType = [];

+ 20 - 19
zhsq_qk-ui/src/views/supermap/supermap.vue

@@ -244,6 +244,7 @@ export default {
      */
     clearM: function () {
       let _that = this
+      console.log("resultLayer",_that.resultLayer)
       _that.resultLayer.clearLayers()
     },
     //查询摄像头落点列表
@@ -304,12 +305,12 @@ export default {
       //创建聚散图层并添加layers
       let that = this;
       let marker = [];
-      that.resultLayer = L.markerClusterGroup({
-        showCoverageOnHover: false,
-        zoomToBoundsOnClick: true,
-        animateAddingMarkers: true,
-        spiderfyOnMaxZoom: true
-      });
+      // that.resultLayer = L.markerClusterGroup({
+      //   showCoverageOnHover: false,
+      //   zoomToBoundsOnClick: true,
+      //   animateAddingMarkers: true,
+      //   spiderfyOnMaxZoom: true
+      // });
       options.data.forEach(e => {
         var lat = e.latitude;
         var lon = e.longitude;
@@ -349,12 +350,12 @@ export default {
     addShelterMark: function (options) {
       //创建聚散图层并添加layers
       let marker = [];
-      this.resultLayer = L.markerClusterGroup({
-        showCoverageOnHover: false,
-        zoomToBoundsOnClick: true,
-        animateAddingMarkers: true,
-        spiderfyOnMaxZoom: true
-      });
+      // this.resultLayer = L.markerClusterGroup({
+      //   showCoverageOnHover: false,
+      //   zoomToBoundsOnClick: true,
+      //   animateAddingMarkers: true,
+      //   spiderfyOnMaxZoom: true
+      // });
       options.data.forEach(e => {
         var lat = e.latitude;
         var lon = e.longitude;
@@ -399,15 +400,15 @@ export default {
       })
     },
     addSuppliesMark: function (options) {
-      let that = this
       //创建聚散图层并添加layers
+      let that = this;
       let marker = [];
-      that.resultLayer = L.markerClusterGroup({
-        showCoverageOnHover: false,
-        zoomToBoundsOnClick: true,
-        animateAddingMarkers: true,
-        spiderfyOnMaxZoom: true
-      });
+      // that.resultLayer = L.markerClusterGroup({
+      //   showCoverageOnHover: false,
+      //   zoomToBoundsOnClick: true,
+      //   animateAddingMarkers: true,
+      //   spiderfyOnMaxZoom: true
+      // });
       options.data.forEach(e => {
         var lat = e.latitude;
         var lon = e.longitude;