Browse Source

[新增]引入外部模块

master
邵佳豪 4 years ago
parent
commit
7838082263
  1. 4
      src/app/app.module.ts
  2. 3
      src/app/key-unit/key-unit.module.ts
  3. 4
      src/app/ui/training-recordinfo/training-recordinfo.component.html
  4. 4
      src/app/ui/ui.module.ts

4
src/app/app.module.ts

@ -19,6 +19,7 @@ import {CacheTokenService} from './http-interceptors/cache-token.service'
import { TreeService } from'./http-interceptors/tree.service'; import { TreeService } from'./http-interceptors/tree.service';
import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥 import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { CountdownModule } from 'ngx-countdown'; //倒计时插件
import { KeyUnitModule } from './key-unit/key-unit.module';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -38,7 +39,8 @@ import { CountdownModule } from 'ngx-countdown'; //倒计时插件
PagesModule, PagesModule,
FormsModule, FormsModule,
HttpClientModule, HttpClientModule,
CountdownModule CountdownModule,
KeyUnitModule
], ],
providers: [httpInterceptorProviders, CacheTokenService,TreeService], providers: [httpInterceptorProviders, CacheTokenService,TreeService],
bootstrap: [AppComponent] bootstrap: [AppComponent]

3
src/app/key-unit/key-unit.module.ts

@ -74,12 +74,11 @@ import { FireFightingDeviceLookComponent } from './fire-fighting-device-look/fir
import { ImagesData2, previewBigImg2 } from './fire-fighting-device-look/imagesdata.component'; import { ImagesData2, previewBigImg2 } from './fire-fighting-device-look/imagesdata.component';
import { ImgsDataDetail2 } from './fire-fighting-device-look/addGrouping.component'; import { ImgsDataDetail2 } from './fire-fighting-device-look/addGrouping.component';
import { LookMaster2 } from './basicinfo-look/lookmaster.component'; import { LookMaster2 } from './basicinfo-look/lookmaster.component';
// import { LookMaster2 } from './basicinfo-look/lookmaster.component';
import { UiModule } from '../../app/ui/ui.module' import { UiModule } from '../../app/ui/ui.module'
@NgModule({ @NgModule({
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2], declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2],
exports:[ViewUnitDetailsPlanComponent], exports:[ViewUnitDetailsPlanComponent,BasicinfoComponent],
imports: [ imports: [
CommonModule, CommonModule,
KeyUnitRoutingModule, KeyUnitRoutingModule,

4
src/app/ui/training-recordinfo/training-recordinfo.component.html

@ -10,7 +10,9 @@
行驶路线 行驶路线
</mat-tab> </mat-tab>
<mat-tab label="熟悉路线"> 熟悉路线 </mat-tab> <mat-tab label="熟悉路线"> 熟悉路线 </mat-tab>
<mat-tab label="单位基本情况"> 单位基本情况 </mat-tab> <mat-tab label="单位基本情况">
<!-- <app-basicinfo></app-basicinfo> -->
</mat-tab>
<mat-tab label="平面图"> 平面图 </mat-tab> <mat-tab label="平面图"> 平面图 </mat-tab>
<mat-tab label="安全疏散设施情况"> 安全疏散设施情况 </mat-tab> <mat-tab label="安全疏散设施情况"> 安全疏散设施情况 </mat-tab>
<mat-tab label="消防设施情况"> 消防设施情况 </mat-tab> <mat-tab label="消防设施情况"> 消防设施情况 </mat-tab>

4
src/app/ui/ui.module.ts

@ -63,11 +63,12 @@ import { AddSixFamiliarComponent, SelectUnit } from './add-six-familiar/add-six-
import { TitleComponent } from './title/title.component' import { TitleComponent } from './title/title.component'
import { HomeComponent } from './home/home.component'; import { HomeComponent } from './home/home.component';
import { TrainingRecordinfoComponent } from './training-recordinfo/training-recordinfo.component'; import { TrainingRecordinfoComponent } from './training-recordinfo/training-recordinfo.component';
import { BasicinfoComponent } from '../key-unit/basicinfo/basicinfo.component';
import { KeyUnitModule } from '../key-unit/key-unit.module';
@NgModule({ @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], 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],
imports: [ imports: [
CommonModule, CommonModule,
UiRoutingModule, UiRoutingModule,
A11yModule, A11yModule,
@ -117,7 +118,6 @@ import { TrainingRecordinfoComponent } from './training-recordinfo/training-reco
FormsModule, FormsModule,
PaginatorModule, PaginatorModule,
FileUploadModule, FileUploadModule,
], ],

Loading…
Cancel
Save