From c475de9d0f9ff01ff2a0f49ea0a30502c96cf768 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 4 Nov 2020 02:29:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=BC=95=E5=85=A5=E6=B0=B4?= =?UTF-8?q?=E6=BA=90=E9=81=93=E8=B7=AF=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/router-gis/router-gis.component.ts | 8 ++-- .../training-recordinfo.component.html | 14 ++++-- src/app/ui/ui.module.ts | 3 +- .../ui/water-road/water-road.component.html | 4 ++ .../ui/water-road/water-road.component.scss | 11 +++++ .../water-road/water-road.component.spec.ts | 25 ++++++++++ src/app/ui/water-road/water-road.component.ts | 47 +++++++++++++++++++ 7 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 src/app/ui/water-road/water-road.component.html create mode 100644 src/app/ui/water-road/water-road.component.scss create mode 100644 src/app/ui/water-road/water-road.component.spec.ts create mode 100644 src/app/ui/water-road/water-road.component.ts diff --git a/src/app/ui/router-gis/router-gis.component.ts b/src/app/ui/router-gis/router-gis.component.ts index bb9a124..8a98d33 100644 --- a/src/app/ui/router-gis/router-gis.component.ts +++ b/src/app/ui/router-gis/router-gis.component.ts @@ -11,15 +11,15 @@ export class RouterGISComponent implements OnInit { constructor() { } ngOnInit(): void { - - } - - ngAfterViewInit(): void { window.setTimeout(()=>{ this.mapInit() },0) } + ngAfterViewInit(): void { + + } + //地图初始化 mapInit () { //创建地图 diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.html b/src/app/ui/training-recordinfo/training-recordinfo.component.html index 196e3f4..ca73a21 100644 --- a/src/app/ui/training-recordinfo/training-recordinfo.component.html +++ b/src/app/ui/training-recordinfo/training-recordinfo.component.html @@ -27,12 +27,20 @@ - + + + - + + + + + + + + - 水源道路情况 diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 3502bda..c655383 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -66,8 +66,9 @@ import { TrainingRecordinfoComponent } from './training-recordinfo/training-reco import { RouterGISComponent } from './router-gis/router-gis.component'; import { KeyUnitModule } from '../key-unit/key-unit.module'; import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component'; +import { WaterRoadComponent } from './water-road/water-road.component'; @NgModule({ - declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent, PhotoofthesceneComponent], + declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent, PhotoofthesceneComponent, WaterRoadComponent], imports: [ CommonModule, diff --git a/src/app/ui/water-road/water-road.component.html b/src/app/ui/water-road/water-road.component.html new file mode 100644 index 0000000..72fdd62 --- /dev/null +++ b/src/app/ui/water-road/water-road.component.html @@ -0,0 +1,4 @@ +
+
+
+ \ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.scss b/src/app/ui/water-road/water-road.component.scss new file mode 100644 index 0000000..52862ba --- /dev/null +++ b/src/app/ui/water-road/water-road.component.scss @@ -0,0 +1,11 @@ +.content { + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 0.244141rem; + overflow: hidden; + .center { + width: 100%; + height: 100%; + } + } \ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.spec.ts b/src/app/ui/water-road/water-road.component.spec.ts new file mode 100644 index 0000000..63c4edb --- /dev/null +++ b/src/app/ui/water-road/water-road.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WaterRoadComponent } from './water-road.component'; + +describe('WaterRoadComponent', () => { + let component: WaterRoadComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WaterRoadComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WaterRoadComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/water-road/water-road.component.ts b/src/app/ui/water-road/water-road.component.ts new file mode 100644 index 0000000..61c8aff --- /dev/null +++ b/src/app/ui/water-road/water-road.component.ts @@ -0,0 +1,47 @@ +import { Component, OnInit } from '@angular/core'; +declare var AMap: any; + +@Component({ + selector: 'app-water-road', + templateUrl: './water-road.component.html', + styleUrls: ['./water-road.component.scss'] +}) +export class WaterRoadComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + ngAfterViewInit(): void { + window.setTimeout(()=>{ + this.mapInit() + },0) + } + + //地图初始化 + mapInit () { + //创建地图 + let map = new AMap.Map('map', { + resizeEnable: true, + cursor: 'default', + zooms:[6,18], + }); + // //构造路线导航类 实际路线 + // let driving = new AMap.Driving({ + // map: map, + // showTraffic: true, + // isOutline: true, + // }); + // driving.search( [{keyword: '广西消防总队',city:'广西'},{keyword: '万科公园里',city:'广西'},{keyword: '南宁明安医院',city:'广西'}], ); + // //构造路线导航类 导航路线 + // let drivingTwo = new AMap.Driving({ + // map: map, + // showTraffic: false, + // }); + // drivingTwo.search( [{keyword: '广西消防总队',city:'广西'},{keyword: '南宁明安医院',city:'广西'}], ); + //function (status,result) { console.log(status,result) } //地图路线 匹配起始点回调函数 + //new AMap.LngLat(116.379028, 39.865042), new AMap.LngLat(116.427281, 39.903719) / [{keyword: '淄博站',city:'山东'},{keyword: '淄博北站',city:'山东'}], //路线可搜索, 可用坐标 + } + + +}