安全应急

zhsq_qk-ui/src/views/fusion/aqyj.vue

@@ -263,7 +263,7 @@ export default {
       dataSource.push(val)
       // var checkbox = document.getElementById("yjcs");
       // checkbox.setAttribute("checked", "");
-      this.$refs.supermap.addMarkers(dataSource, "yjj")
+      // this.$refs.supermap.addMarkers(dataSource, "yjj")
       this.$refs.supermap.dropLocation(val.latitude, val.longitude);
     },
     //可视化查询应急局摄像头列表

zhsq_qk-ui/src/views/supermap/supermap.vue

@@ -89,8 +89,6 @@ export default {
       rfhSj: null,
       // 年份
       year: null,
-
-      pageType: null,
       //事件落点类型
       markType: ['sxt'],
       //事件详情页是否显示
@@ -165,41 +163,41 @@ export default {
         this.map_qikaiYingXiangLunKuo = window.L.supermap.tiledMapLayer(this.workspace_qkyxtlk, {
           noWrap: true
         });
-        this.initSlt(this.pageType);
+        this.initSlt();
       });
     },
 
     /**
      * 矢量图
      */
-    initSlt: async function (pageType) {
+    initSlt: async function () {
       this.layers.push(this.map_jilinShiLiang);//吉林矢量
-      this.initYxt(pageType);
+      this.initYxt();
     },
 
     /**
      * 影像图
      */
-    initYxt: async function (pageType) {
+    initYxt: async function () {
       if (this.yxtSlt == 'yxt') {//影像图
         this.layers.push(this.map_qikaiYingXiang);//汽开影像
         this.layers.push(this.map_qikaiYingXiangLunKuo);//汽开影像轮廓
       }
-      this.initZxd(pageType);
+      this.initZxd();
     },
 
     /**
      * 事件落点
      */
-    initSjd: async function (pageType) {
-      this.init(this.markType, this.map,pageType);
+    initSjd: async function () {
+      this.init(this.markType, this.map);
     },
 
     /**
      * 中心点、zoom
      */
-    initZxd: async function (pageType) {
-      this.initMap(pageType);
+    initZxd: async function () {
+      this.initMap();
     },
     /**
      * 落点定位
@@ -210,7 +208,7 @@ export default {
     /**
      * 加载地图
      */
-    initMap: async function (pageType) {
+    initMap: async function () {
       let _that = this;
       this.map && this.map.remove();
       this.map = window.L.map('qksupermap', {
@@ -224,13 +222,13 @@ export default {
         attributionControl: false,
         logoControl: false,
       });
-      this.initSjd(pageType);
+      this.initSjd();
     },
     //事件落点相关方法
-    init: function (markType, map,pageType) {
-      if(pageType == "jtzl") {
+    init: function (markType, map) {
+      if(this.pageType == "jtzl") {
         this.selectCameraList()
-      } else if (pageType == "aqyj") {
+      } else if (this.pageType == "aqyj") {
         this.getBuildTypeFourList()
       }
     },
@@ -369,6 +367,7 @@ export default {
     },
 
     addEmergencyMark(option, type) {
+      console.log("this.myLayerGroup",this.myLayerGroup)
       //定义图标
       let icon = new window.L.Icon({
         iconUrl: yjIconList[type],