Merge commit 'a37cd8f9fca8289f949525bdc26e73834565176f'

src/mock/real.ts

@@ -1,23 +1,27 @@
 export default [[
-    13312554.24,
+    11661118.72,
-    4098441.2800000003,
+    3692382.4,
-    0.4
+    0
 ],[
-    13313066.24,
+    11661186.56,
-    4098892.48,
+    3692696.64,
-    0.476328125
+    0
 ],[
-    13313446.4,
+    11660930.56,
-    4098451.52,
+    3692642.88,
-    0.4000390625
+    3.583046875
 ],[
-    13312994.56,
+    11660729.6,
-    4098064.96,
+    3692633.2800000003,
-    0.3999609375
+    3.5830078125
 ],[
-    13312628.48,
+    11660718.08,
-    4098448.3200000003,
+    3692349.12,
-    0.39998046875
+    0
+],[
+    11660874.24,
+    3692352.3200000003,
+    -0.0000390625
 ]
     
 ]

src/views/base.component.ts

@@ -59,7 +59,7 @@ export default class BaseComponent extends Vue {
     // 添加电子围栏 // 安全线  // 实控线 // 规划线
     public async toggleArea(layer){
         if(!layer.ids.length){
-            const result = this.dataList[layer.value].map(item=>{
+            const result = layer.data.map(item=>{
                 return {
                     id:item.id,
                     groupId:layer.value,

src/views/overview.component.ts

@@ -134,6 +134,8 @@ export default class OverViewComponent extends BaseComponent {
         layer.selected = !layer.selected;
         if(layer.type === "moveMarker"){
             this.addMarker(layer,true)
+        }else{
+            this.toggleArea(layer)
         }
     }
     //进入自由导览