From d76ab10342037e8821d78bafa097e058060b3546 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 7 Jun 2021 14:36:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=9C=B0=E5=9B=BE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=A0=AA=E6=B4=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinfo-look/basicinfo.component.ts     | 22 ++++++++++++++-
 .../key-unit/basicinfo/basicinfo.component.ts | 28 +++++++++----------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.ts b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
index 0278bc0..5b202a1 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
@@ -153,7 +153,27 @@ export class BasicinfoLookComponent implements OnInit {
     });
 
 
-    if (this.isMapLabel) {//如果已经标注单位坐标
+  if(this.isMapLabel){//如果已经标注单位坐标
+    // console.log('已标注单位位置')
+    this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
+    this.oldPositionMarker = new AMap.Marker({
+      position: [this.unitinfo.location.x,this.unitinfo.location.y],
+      content: this.newPositionMarkerContent,
+      offset: new AMap.Pixel(-15, -18)
+    })
+    // 将 markers 添加到地图
+    this.map.add(this.oldPositionMarker);
+  }else{
+    // console.log('未标注单位位置')
+    this.map.setCity('株洲市');
+  }
+  }
+  markerPosition2
+  //点击位置按钮
+  setPosition(){
+    this.isGisTopBox = false
+    this.isGisTopBoxTwo = true
+    if(this.isMapLabel){//如果已经标注单位坐标
       // console.log('已标注单位位置')
       this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
       this.oldPositionMarker = new AMap.Marker({
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 97b224e..48357ef 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -192,20 +192,20 @@ export class BasicinfoComponent implements OnInit {
 
     });
 
-    if (this.isMapLabel) {//如果已经标注单位坐标
-      // console.log('已标注单位位置')
-      this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
-      this.oldPositionMarker = new AMap.Marker({
-        position: [this.unitinfo.location.x, this.unitinfo.location.y],
-        content: this.newPositionMarkerContent,
-        offset: new AMap.Pixel(-34, -36)
-      })
-      // 将 markers 添加到地图
-      this.map.add(this.oldPositionMarker);
-    } else {
-      // console.log('未标注单位位置')
-      this.map.setCity('上海');
-    }
+  if(this.isMapLabel){//如果已经标注单位坐标
+    // console.log('已标注单位位置')
+    this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
+    this.oldPositionMarker = new AMap.Marker({
+      position: [this.unitinfo.location.x,this.unitinfo.location.y],
+      content: this.newPositionMarkerContent,
+      offset: new AMap.Pixel(-15, -18)
+    })
+    // 将 markers 添加到地图
+    this.map.add(this.oldPositionMarker);
+  }else{
+    // console.log('未标注单位位置')
+    this.map.setCity('株洲市');
+  }
   }
   markerPosition2
   //点击位置按钮