From 0361dc06ed1f45ee5caa4d804a2362225ea87994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Thu, 18 May 2023 09:13:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=91=A8=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/real.ts | 34 ++++++++++++++++++--------------- src/views/base.component.ts | 2 +- src/views/overview.component.ts | 2 ++ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/mock/real.ts b/src/mock/real.ts index e877df6..77fe5d7 100644 --- a/src/mock/real.ts +++ b/src/mock/real.ts @@ -1,23 +1,27 @@ export default [[ - 13312554.24, - 4098441.2800000003, - 0.4 + 11661118.72, + 3692382.4, + 0 ],[ - 13313066.24, - 4098892.48, - 0.476328125 + 11661186.56, + 3692696.64, + 0 ],[ - 13313446.4, - 4098451.52, - 0.4000390625 + 11660930.56, + 3692642.88, + 3.583046875 ],[ - 13312994.56, - 4098064.96, - 0.3999609375 + 11660729.6, + 3692633.2800000003, + 3.5830078125 ],[ - 13312628.48, - 4098448.3200000003, - 0.39998046875 + 11660718.08, + 3692349.12, + 0 +],[ + 11660874.24, + 3692352.3200000003, + -0.0000390625 ] ] \ No newline at end of file diff --git a/src/views/base.component.ts b/src/views/base.component.ts index 19431a1..cece6fd 100644 --- a/src/views/base.component.ts +++ b/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, diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index 49215d6..0c2c5b7 100644 --- a/src/views/overview.component.ts +++ b/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) } } //进入自由导览