merge

src/app/main/main.component.ts

@@ -360,7 +360,6 @@ export class MainComponent implements OnInit {
   toNormalWay() {
     this.normalShow = !this.normalShow;
 
-<<<<<<< HEAD
     if (this.normalShow) {
       ///map.clearOverlays();
       this.http.get<any>(this.s.basePath + `/project/list/${markType.NORMAL}`).subscribe(res => {
@@ -371,13 +370,6 @@ export class MainComponent implements OnInit {
       this.map.centerAndZoom("山西省",8);
     }
 
-=======
-    this.http
-      .get<any>(this.s.basePath + `/project/list/${markType.NORMAL}`)
-      .subscribe(res => {
-        this.normalProjects = res.data;
-      });
->>>>>>> 00350ea8987895ef638def14a2cca7611415aead
   }
   openDialog(id: string) {
     this.modalService.open(id);