From 78380822636564679c7c24224440334a15ca264a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 6 Nov 2020 10:23:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=BC=95=E5=85=A5=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/app.module.ts                                         | 4 +++-
 src/app/key-unit/key-unit.module.ts                           | 3 +--
 .../ui/training-recordinfo/training-recordinfo.component.html | 4 +++-
 src/app/ui/ui.module.ts                                       | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index eea1f7b..56a0618 100644
--- a/src/app/app.module.ts
+++ b/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 { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
 import { CountdownModule } from 'ngx-countdown'; //倒计时插件
+import { KeyUnitModule } from './key-unit/key-unit.module';
 
 @NgModule({
   declarations: [
@@ -38,7 +39,8 @@ import { CountdownModule } from 'ngx-countdown'; //倒计时插件
     PagesModule,
     FormsModule,
     HttpClientModule,
-    CountdownModule
+    CountdownModule,
+    KeyUnitModule
   ],
   providers: [httpInterceptorProviders, CacheTokenService,TreeService],
   bootstrap: [AppComponent]
diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts
index 6bc8ca4..c536b4c 100644
--- a/src/app/key-unit/key-unit.module.ts
+++ b/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 { ImgsDataDetail2 } from './fire-fighting-device-look/addGrouping.component';
 import { LookMaster2 } from './basicinfo-look/lookmaster.component';
-// import { LookMaster2 } from './basicinfo-look/lookmaster.component';
 import { UiModule } from '../../app/ui/ui.module'
 
 @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],
-  exports:[ViewUnitDetailsPlanComponent],
+  exports:[ViewUnitDetailsPlanComponent,BasicinfoComponent],
   imports: [
     CommonModule,
     KeyUnitRoutingModule,
diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.html b/src/app/ui/training-recordinfo/training-recordinfo.component.html
index cd69c2e..98c29bc 100644
--- a/src/app/ui/training-recordinfo/training-recordinfo.component.html
+++ b/src/app/ui/training-recordinfo/training-recordinfo.component.html
@@ -10,7 +10,9 @@
                     行驶路线 
                 </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>
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 9e5005e..e3aec45 100644
--- a/src/app/ui/ui.module.ts
+++ b/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 { HomeComponent } from './home/home.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({
   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: [
-    
     CommonModule,
     UiRoutingModule,
     A11yModule,
@@ -117,7 +118,6 @@ import { TrainingRecordinfoComponent } from './training-recordinfo/training-reco
     FormsModule,
     PaginatorModule,
     FileUploadModule,
-
   ],