[完善]平面图引入gis完善

src/app/ui/collection-tools-plan/collection-tools.component.ts

@@ -789,7 +789,6 @@ export class CollectionToolsPlanComponent implements OnInit {
             });
           }
         }
-
         if ((new Set(adjoinArr)).size != adjoinArr.length) {
           this.maskLayerService.sendMessage(false)
           let config = new MatSnackBarConfig();
@@ -800,6 +799,21 @@ export class CollectionToolsPlanComponent implements OnInit {
         } else {
           //如果是单位 总平面图
           if (this.checkedBuildingIndex == -1) {
+
+            if(this.isGis){
+              let data = JSON.parse(JSON.stringify(this.selectingSitePlan))
+              data.zoomLevel = this.map.getZoom(),
+              data.defaultCenter = {x:this.map.getCenter().lng,y:this.map.getCenter().lat}
+              delete data.userId
+              delete data.userName
+              delete data.sitePlanDataInfo
+              console.log('gisselectingSitePlan',this.selectingSitePlan)
+
+              this.http.put(`/api/SitePlans/${this.selectingSitePlan.id}`,data).subscribe(data=>{
+                console.log('保存中心点成功')
+              })
+            }
+
             //保存平面图数据
             this.http.post("/api/SitePlanData", SitePlanData, {
               params: {
@@ -1392,11 +1406,19 @@ export class CollectionToolsPlanComponent implements OnInit {
   map: any
   toLoadGis() {
     console.log(666666, this.selectingSitePlan)
+    
     this.map = new AMap.Map('planContainer', {
       viewMode: '2D', // 默认使用 2D 模式，如果希望使用带有俯仰角的 3D 模式，请设置 viewMode: '3D',
       zoom: 11, //初始化地图层级
     });
+    if(this.selectingSitePlan.defaultCenter){
+      console.log('设置了吗')
+      this.map.setZoom(this.selectingSitePlan.zoomLevel); //设置地图层级
+      this.map.setCenter([this.selectingSitePlan.defaultCenter.x, this.selectingSitePlan.defaultCenter.y])
+    }else{
       this.map.setCity('上海市');
+    }
+   
     this.map.on('click', (e) => {
       this.showInfoClick(e)
     });
@@ -2031,13 +2053,13 @@ export class CollectionToolsPlanComponent implements OnInit {
     let fileSize = file.size || null //上传文件的总大小
     let maxSize = 5 * 1024 * 1024 //5MB一个分片
     let tenSize = 10 * 1024 * 1024 //10MB限制
-    if (file && file.name.toLowerCase().indexOf('png') == -1 && file.name.toLowerCase().indexOf('jpg') == -1 && file.name.toLowerCase().indexOf('jpeg') == -1) {
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
-      return
-     }
+    if (file && file.name.toLowerCase().indexOf('png') == -1 && file.name.toLowerCase().indexOf('jpg') == -1 && file.name.toLowerCase().indexOf('jpeg') == -1) {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+      return
+    }
 
     if (file && fileSize <= maxSize) { //上传文件<=5MB时
       let formData = new FormData()

src/app/ui/collection-tools-plan/leftFunctionalDomain.ts

@@ -292,7 +292,9 @@ export class editPlaneFigureComponentPlan implements OnInit {
         details:e.details,
         enabled: this.data.buildingData.enabled,
         modifiedTime: new Date(),
-        isGis: this.data.isGis
+        isGis: this.data.isGis,
+        zoomLevel:this.data.buildingData.zoomLevel,
+        defaultCenter:this.data.buildingData.defaultCenter
       }
       this.http.put(`/api/SitePlans/${this.data.buildingData.id}`,data).subscribe(data=>{
         this.dialogRef.close('总平面图');

src/app/working-area/working-area.component.ts

@@ -641,9 +641,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 重置画布
    */
   public resetCanvas() {
-    console.log(this.init)
+    if(!this.init.isGis){
       this.app.renderer.resize(this.content.nativeElement.clientWidth, this.content.nativeElement.clientHeight);
-
+    }
   }
   /**
    * 设置名称显示