Merge branch 'master' of gitlab.juicestime.com:niuxiaolin/supervise-front

src/app/app.module.ts

@@ -15,7 +15,6 @@ import { NgZorroAntdModule, NZ_I18N, zh_CN, NzIconModule } from "ng-zorro-antd";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { LoginComponent } from "./login/login.component";
 import { QsMarkComponent } from "./qs-mark/qs-mark.component";
-import { NgxEchartsModule } from "ngx-echarts";
 @NgModule({
   declarations: [
     AppComponent,
@@ -34,7 +33,6 @@ import { NgxEchartsModule } from "ngx-echarts";
     FormsModule,
     ReactiveFormsModule,
     ApiModule,
-    NgxEchartsModule,
     NzIconModule,
     /** 导入 ng-zorro-antd 模块 **/
     NgZorroAntdModule,

src/app/main/main.component.html

@@ -69,7 +69,7 @@
 
     </fieldset>
     <fieldset>
-      <legend>普通干线</legend>
+      <legend (click)="toNormalWay()">普通干线</legend>
 
       <div class="proj-info" *ngIf="!normalShow">
         <label>
@@ -100,10 +100,15 @@
           </div>
         </label>
       </div>
-      <section *ngIf="normalShow" class="sub">
+      <!-- <section *ngIf="normalShow" class="sub">
 
         <label (click)="highLight(i,prj)" *ngFor="let prj of normalProjects;let i=index">{{prj.name}}
         </label>
+      </section> -->
+      <section *ngIf="normalShow" class="sub">
+        <div class="item" *ngFor="let prj of normalProjects;let i=index">
+          <label (click)="highLight(i,prj,'p');setPrj(prj);">{{prj.name}} </label>
+        </div>
       </section>
     </fieldset>
   </div>

src/app/main/main.component.ts

@@ -357,15 +357,19 @@ export class MainComponent implements OnInit {
     //map.setViewport(allPoints.map(p => ({ lng: p[0], lat: p[1] })));
   }
 
-  toNormal() {
-    this.map.clearOverlays();
+  toNormalWay() {
     this.normalShow = !this.normalShow;
 
-    this.http
-      .get<any>(this.s.basePath + `/project/list/${markType.NORMAL}`)
-      .subscribe(res => {
+    if (this.normalShow) {
+      ///map.clearOverlays();
+      this.http.get<any>(this.s.basePath + `/project/list/${markType.NORMAL}`).subscribe(res => {
         this.normalProjects = res.data;
+        var points =  this.loadPolys(res,true);
       });
+    }else{
+      this.map.centerAndZoom("山西省",8);
+    }
+
   }
   openDialog(id: string) {
     this.modalService.open(id);

src/app/qs-mark/qs-mark.component.html

@@ -4,9 +4,9 @@
 
 <div class="main">
   <div class="aside">
-    <button class="ie-fix-button" (click)="back()">返回</button>
+    <button class="ie-fix-button" >返回</button>
     <nz-tree [nzShowIcon]="true" [nzTreeTemplate]="nzTreeTemplate" [nzData]="nodes" nzAsyncData
-      (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)">
+       (nzExpandChange)="nzEvent($event)">
       <ng-template #nzTreeTemplate let-node>
         <span *ngIf="node.isLeaf">
           <i nz-icon nzType="video-camera" nzTheme="outline"></i>

src/app/qs-mark/qs-mark.component.ts

@@ -2,7 +2,6 @@ import { Component, OnInit } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 import { NzFormatEmitEvent } from "ng-zorro-antd";
 import { DefaultService } from "../api";
-import { EChartOption } from "echarts";
 @Component({
   selector: "app-qs-mark",
   templateUrl: "./qs-mark.component.html",

src/main.ts

@@ -4,9 +4,9 @@ import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import { AppModule } from "./app/app.module";
 import { environment } from "./environments/environment";
 /** echarts extensions: */
-import "echarts-gl";
-import "echarts/theme/macarons.js";
-import "echarts/dist/extension/bmap.min.js";
+// import "echarts-gl";
+// import "echarts/theme/macarons.js";
+// import "echarts/dist/extension/bmap.min.js";
 if (environment.production) {
   enableProdMode();
 }