From 5b23c35736e3777134b0873584b3f99a09f46cb0 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Thu, 30 Jul 2020 17:05:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20H5=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- src/app/navigation/navigation.component.html | 1 + .../collection-tools.component.html | 34 +++++++++++ .../collection-tools.component.scss | 60 +++++++++++++++++++ .../collection-tools.component.spec.ts | 25 ++++++++ .../collection-tools.component.ts | 15 +++++ src/app/ui/ui-routing.module.ts | 3 +- src/app/ui/ui.module.ts | 3 +- src/styles.scss | 3 + 9 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 src/app/ui/collection-tools/collection-tools.component.html create mode 100644 src/app/ui/collection-tools/collection-tools.component.scss create mode 100644 src/app/ui/collection-tools/collection-tools.component.spec.ts create mode 100644 src/app/ui/collection-tools/collection-tools.component.ts diff --git a/proxy.config.json b/proxy.config.json index 70e3504..234d118 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://39.106.78.171:8088", + "target": "http://121.37.20.190:8008", "secure": false, "changeOrigin": true } diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 7cd1af8..6e3e3ee 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -10,6 +10,7 @@
  • 基本信息
  • 平面图
    • +
  • H5平面图
  • 四周毗邻
    • diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html new file mode 100644 index 0000000..3bd34d3 --- /dev/null +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -0,0 +1,34 @@ +
    + + +
    + +
    + + +
    + 2 +
    + + +
    + + + + + + +
    + + +
    + +
    + +
    +     + +     +
    + +
    \ No newline at end of file diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss new file mode 100644 index 0000000..75b3379 --- /dev/null +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -0,0 +1,60 @@ +.content { + width: 100%; + height: 93%; + overflow: hidden; + box-sizing: border-box; + padding: 3px; + display: flex; + flex-direction: column; +} + +//header头部 +.header { + flex: 5%; + min-height: 40px; + background-color: #fff; +} + +//头部操作栏 +.headerOperate { + flex: 5%; + min-height: 40px; + box-sizing: border-box; + margin: 3px 0; +} + +//功能区 +.mat-drawer:not(.mat-drawer-side) { + box-shadow: none; + border: 1px solid #E6EAEE; + background-color: #E6EAEE; +} +.functionalDomain { + flex: 90%; + .functionalDomainContent { + width: 100%; + height: 100%; + } + .functionalDomainLeft { + width: 13%; + height: 100%; + } + .functionalDomainRight { + background-color: #fff; + height: 100%; + display: flex; + position: relative; + .h5Unity { + flex: 100%; + } + .rightAttribute{ + width: 13%; + height: 100%; + position: absolute; + right: 0; + bottom: 0; + border: 1px solid #E6EAEE; + background-color: #E6EAEE; + } + } +} \ No newline at end of file diff --git a/src/app/ui/collection-tools/collection-tools.component.spec.ts b/src/app/ui/collection-tools/collection-tools.component.spec.ts new file mode 100644 index 0000000..acc7d5e --- /dev/null +++ b/src/app/ui/collection-tools/collection-tools.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CollectionToolsComponent } from './collection-tools.component'; + +describe('CollectionToolsComponent', () => { + let component: CollectionToolsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CollectionToolsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CollectionToolsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts new file mode 100644 index 0000000..a771a73 --- /dev/null +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-collection-tools', + templateUrl: './collection-tools.component.html', + styleUrls: ['./collection-tools.component.scss'] +}) +export class CollectionToolsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 4c5ff91..f1a06bb 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -9,6 +9,7 @@ import { KeySiteComponent } from './key-site/key-site.component'; import { FunctionDivisionComponent } from './function-division/function-division.component'; import { RealisticPictureComponent } from './realistic-picture/realistic-picture.component'; import { UploadingCADComponent } from './uploading-cad/uploading-cad.component'; +import {CollectionToolsComponent} from './collection-tools/collection-tools.component' const routes: Routes = [ { path: '', component:UserdataComponent }, @@ -21,7 +22,7 @@ const routes: Routes = [ { path: 'function-division', component:FunctionDivisionComponent }, { path: 'realistic-picture', component:RealisticPictureComponent }, { path: 'uploadingCAD', component:UploadingCADComponent }, - + { path: 'collectionTools', component:CollectionToolsComponent }, ]; @NgModule({ diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 12834b4..d0feaa5 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -95,9 +95,10 @@ import { ImgsDataDetail } from './fire-fighting-device/addGrouping.component'; import { KeySiteImgs } from './key-site/keysiteimgs.component'; import { KeyImgDetail } from './key-site/keyimgdetail.component'; import { LookMaster } from './basicinfo/lookmaster.component'; +import { CollectionToolsComponent } from './collection-tools/collection-tools.component'; @NgModule({ - declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails,ImagesData,ImgsDataDetail,KeySiteImgs,KeyImgDetail,addPartition,addPartitionAttribute,previewImg,addRealPicture,editRealPicture,readFile,editFile,LookMaster,previewBigImg + declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails,ImagesData,ImgsDataDetail,KeySiteImgs,KeyImgDetail,addPartition,addPartitionAttribute,previewImg,addRealPicture,editRealPicture,readFile,editFile,LookMaster,previewBigImg, CollectionToolsComponent ], imports: [ diff --git a/src/styles.scss b/src/styles.scss index 0a479ed..251f205 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -57,6 +57,9 @@ table td.mat-footer-cell:last-of-type{ height: 100%; overflow-y: auto; } +.mat-drawer-backdrop.mat-drawer-shown{ + background-color: #fff; +} .mat-content { //可展开面板垂直居中 align-items: center; }