From 5b93296b62a5fea958971cc563698eefd54e105f Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 7 Jan 2021 11:10:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=88=9B=E5=BB=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 1 + src/app/app.module.ts | 4 +- .../data-collection/data-collection.module.ts | 101 ++++++++++++++++++ .../data-collection.routing.ts | 21 ++++ .../fire-force/fire-force.component.html | 8 ++ .../fire-force/fire-force.component.scss | 18 ++++ .../fire-force/fire-force.component.spec.ts | 25 +++++ .../fire-force/fire-force.component.ts | 15 +++ .../linkage-forces.component.html | 8 ++ .../linkage-forces.component.scss | 18 ++++ .../linkage-forces.component.spec.ts | 25 +++++ .../linkage-forces.component.ts | 15 +++ .../water-collection.component.html | 8 ++ .../water-collection.component.scss | 18 ++++ .../water-collection.component.spec.ts | 25 +++++ .../water-collection.component.ts | 15 +++ 16 files changed, 324 insertions(+), 1 deletion(-) create mode 100644 src/app/data-collection/data-collection.module.ts create mode 100644 src/app/data-collection/data-collection.routing.ts create mode 100644 src/app/data-collection/fire-force/fire-force.component.html create mode 100644 src/app/data-collection/fire-force/fire-force.component.scss create mode 100644 src/app/data-collection/fire-force/fire-force.component.spec.ts create mode 100644 src/app/data-collection/fire-force/fire-force.component.ts create mode 100644 src/app/data-collection/linkage-forces/linkage-forces.component.html create mode 100644 src/app/data-collection/linkage-forces/linkage-forces.component.scss create mode 100644 src/app/data-collection/linkage-forces/linkage-forces.component.spec.ts create mode 100644 src/app/data-collection/linkage-forces/linkage-forces.component.ts create mode 100644 src/app/data-collection/water-collection/water-collection.component.html create mode 100644 src/app/data-collection/water-collection/water-collection.component.scss create mode 100644 src/app/data-collection/water-collection/water-collection.component.spec.ts create mode 100644 src/app/data-collection/water-collection/water-collection.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 40fdb16..66ed8d5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -27,6 +27,7 @@ const routes: Routes = [ {path:'visualization',component: HomeComponent}, {path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)}, {path:'statisticanalysis',loadChildren:() => import('./statistic-analysis/statistic-analysis.module').then(m => m.StatisticAnalysisModule)}, + {path:'dataCollection',loadChildren:() => import('./data-collection/data-collection.module').then(m => m.DataCollectionModule)}, ] }, {path:'login', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3b99be1..257e099 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -20,6 +20,7 @@ import { TreeService } from'./http-interceptors/tree.service'; import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥 import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { GISManagementModule } from './gis-management/gis-management.module'; +import { DataCollectionModule } from './data-collection/data-collection.module'; @NgModule({ declarations: [ @@ -40,7 +41,8 @@ import { GISManagementModule } from './gis-management/gis-management.module'; FormsModule, HttpClientModule, CountdownModule, - GISManagementModule + GISManagementModule, + DataCollectionModule ], providers: [httpInterceptorProviders, CacheTokenService,TreeService], bootstrap: [AppComponent] diff --git a/src/app/data-collection/data-collection.module.ts b/src/app/data-collection/data-collection.module.ts new file mode 100644 index 0000000..fe8089e --- /dev/null +++ b/src/app/data-collection/data-collection.module.ts @@ -0,0 +1,101 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {A11yModule} from '@angular/cdk/a11y'; +import {DragDropModule} from '@angular/cdk/drag-drop'; +import {PortalModule} from '@angular/cdk/portal'; +import {ScrollingModule} from '@angular/cdk/scrolling'; +import {CdkStepperModule} from '@angular/cdk/stepper'; +import {CdkTableModule} from '@angular/cdk/table'; +import {CdkTreeModule} from '@angular/cdk/tree'; +import {MatAutocompleteModule} from '@angular/material/autocomplete'; +import {MatBadgeModule} from '@angular/material/badge'; +import {MatBottomSheetModule} from '@angular/material/bottom-sheet'; +import {MatButtonModule} from '@angular/material/button'; +import {MatButtonToggleModule} from '@angular/material/button-toggle'; +import {MatCardModule} from '@angular/material/card'; +import {MatCheckboxModule} from '@angular/material/checkbox'; +import {MatChipsModule} from '@angular/material/chips'; +import {MatStepperModule} from '@angular/material/stepper'; +import {MatDatepickerModule} from '@angular/material/datepicker'; +import {MatDialogModule} from '@angular/material/dialog'; +import {MatDividerModule} from '@angular/material/divider'; +import {MatExpansionModule} from '@angular/material/expansion'; +import {MatGridListModule} from '@angular/material/grid-list'; +import {MatIconModule} from '@angular/material/icon'; +import {MatInputModule} from '@angular/material/input'; +import {MatListModule} from '@angular/material/list'; +import {MatMenuModule} from '@angular/material/menu'; +import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core'; +import {MatPaginatorModule} from '@angular/material/paginator'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {MatRadioModule} from '@angular/material/radio'; +import {MatSelectModule} from '@angular/material/select'; +import {MatSidenavModule} from '@angular/material/sidenav'; +import {MatSliderModule} from '@angular/material/slider'; +import {MatSlideToggleModule} from '@angular/material/slide-toggle'; +import {MatSnackBarModule} from '@angular/material/snack-bar'; +import {MatSortModule} from '@angular/material/sort'; +import {MatTableModule} from '@angular/material/table'; +import {MatTabsModule} from '@angular/material/tabs'; +import {MatToolbarModule} from '@angular/material/toolbar'; +import {MatTooltipModule} from '@angular/material/tooltip'; +import {MatTreeModule} from '@angular/material/tree'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { DataCollectionRoutingModule } from './data-collection.routing'; +import { WaterCollectionComponent } from './water-collection/water-collection.component'; +import { FireForceComponent } from './fire-force/fire-force.component'; +import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component'; + +@NgModule({ + declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent], + imports: [ + CommonModule, + A11yModule, + CdkStepperModule, + CdkTableModule, + CdkTreeModule, + DragDropModule, + MatAutocompleteModule, + MatBadgeModule, + MatBottomSheetModule, + MatButtonModule, + MatButtonToggleModule, + MatCardModule, + MatCheckboxModule, + MatChipsModule, + MatStepperModule, + MatDatepickerModule, + MatDialogModule, + MatDividerModule, + MatExpansionModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatNativeDateModule, + MatPaginatorModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatRadioModule, + MatRippleModule, + MatSelectModule, + MatSidenavModule, + MatSliderModule, + MatSlideToggleModule, + MatSnackBarModule, + MatSortModule, + MatTableModule, + MatTabsModule, + MatToolbarModule, + MatTooltipModule, + MatTreeModule, + PortalModule, + ScrollingModule, + FormsModule, + ReactiveFormsModule, + DataCollectionRoutingModule + ] +}) +export class DataCollectionModule { } diff --git a/src/app/data-collection/data-collection.routing.ts b/src/app/data-collection/data-collection.routing.ts new file mode 100644 index 0000000..3a526dd --- /dev/null +++ b/src/app/data-collection/data-collection.routing.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { FireForceComponent } from './fire-force/fire-force.component'; +import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component'; +import { WaterCollectionComponent } from './water-collection/water-collection.component'; + + + +const routes: Routes = [ + { path: 'water', component: WaterCollectionComponent }, + { path: 'fireForce', component: FireForceComponent }, + { path: 'linkageForces', component: LinkageForcesComponent } +]; + + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class DataCollectionRoutingModule { } diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html new file mode 100644 index 0000000..413184e --- /dev/null +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -0,0 +1,8 @@ +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss new file mode 100644 index 0000000..ef03c8d --- /dev/null +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -0,0 +1,18 @@ +.box{ + width: 100%; + height: 100%; + background-color: #F2F4F6; + display: flex; + box-sizing: border-box; + padding: 10px; +} +.listbox{ + width: 400px; + height: 100%; + background-color: #fff; +} +.mapbox{ + flex: 1; + margin-left: 10px; + background-color: #fff; +} \ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.spec.ts b/src/app/data-collection/fire-force/fire-force.component.spec.ts new file mode 100644 index 0000000..fc54853 --- /dev/null +++ b/src/app/data-collection/fire-force/fire-force.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FireForceComponent } from './fire-force.component'; + +describe('FireForceComponent', () => { + let component: FireForceComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FireForceComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FireForceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts new file mode 100644 index 0000000..07d8d8e --- /dev/null +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-fire-force', + templateUrl: './fire-force.component.html', + styleUrls: ['./fire-force.component.scss'] +}) +export class FireForceComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.html b/src/app/data-collection/linkage-forces/linkage-forces.component.html new file mode 100644 index 0000000..413184e --- /dev/null +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.html @@ -0,0 +1,8 @@ +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss new file mode 100644 index 0000000..ef03c8d --- /dev/null +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss @@ -0,0 +1,18 @@ +.box{ + width: 100%; + height: 100%; + background-color: #F2F4F6; + display: flex; + box-sizing: border-box; + padding: 10px; +} +.listbox{ + width: 400px; + height: 100%; + background-color: #fff; +} +.mapbox{ + flex: 1; + margin-left: 10px; + background-color: #fff; +} \ No newline at end of file diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.spec.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.spec.ts new file mode 100644 index 0000000..81d7b45 --- /dev/null +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LinkageForcesComponent } from './linkage-forces.component'; + +describe('LinkageForcesComponent', () => { + let component: LinkageForcesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ LinkageForcesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LinkageForcesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts new file mode 100644 index 0000000..cbddc20 --- /dev/null +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-linkage-forces', + templateUrl: './linkage-forces.component.html', + styleUrls: ['./linkage-forces.component.scss'] +}) +export class LinkageForcesComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html new file mode 100644 index 0000000..413184e --- /dev/null +++ b/src/app/data-collection/water-collection/water-collection.component.html @@ -0,0 +1,8 @@ +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss new file mode 100644 index 0000000..ef03c8d --- /dev/null +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -0,0 +1,18 @@ +.box{ + width: 100%; + height: 100%; + background-color: #F2F4F6; + display: flex; + box-sizing: border-box; + padding: 10px; +} +.listbox{ + width: 400px; + height: 100%; + background-color: #fff; +} +.mapbox{ + flex: 1; + margin-left: 10px; + background-color: #fff; +} \ No newline at end of file diff --git a/src/app/data-collection/water-collection/water-collection.component.spec.ts b/src/app/data-collection/water-collection/water-collection.component.spec.ts new file mode 100644 index 0000000..83a0e58 --- /dev/null +++ b/src/app/data-collection/water-collection/water-collection.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WaterCollectionComponent } from './water-collection.component'; + +describe('WaterCollectionComponent', () => { + let component: WaterCollectionComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WaterCollectionComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WaterCollectionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts new file mode 100644 index 0000000..18998f1 --- /dev/null +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-water-collection', + templateUrl: './water-collection.component.html', + styleUrls: ['./water-collection.component.scss'] +}) +export class WaterCollectionComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +}