[新增]完善新增页面，增加训练记录选项卡

src/app/app-routing.module.ts

@@ -8,6 +8,7 @@ import { HomeComponent } from './home/home.component'
 import { AuthGuard } from './auth.guard'
 import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
 import { AddSixFamiliarComponent } from './ui/add-six-familiar/add-six-familiar.component';
+import { TrainingRecordinfoComponent } from './ui/training-recordinfo/training-recordinfo.component';
 
 
 
@@ -28,14 +29,16 @@ const routes: Routes = [
   },
   {path:'addsixfamiliar',
   component:AddSixFamiliarComponent},
+  {path:'trainingrecordinfo',
+  component:TrainingRecordinfoComponent},
   {path:'login',
   component:LoginComponent},
 
   {path:'getNoMToken',
   component:MTokenK1Component, canActivate: [AuthGuard],},
    //K1秘钥验证失败是跳转页面
-   {path:'home', component:HomeComponent,canActivate: [AuthGuard],}//守卫验证
-    ]
+  {path:'home', component:HomeComponent,canActivate: [AuthGuard],}//守卫验证
+]
 
 
 @NgModule({

src/app/ui/add-six-familiar/Select-unit-list.html

@@ -2,10 +2,18 @@
     <div class="topbox">
         <div>
             <span>单位名称 : </span>
-            <input type="text" placeholder="请输入单位名称">
+            <input type="text" placeholder="请输入单位名称" [(ngModel)]="unitName">
+        </div>
+        <div>
+            <button mat-stroked-button (click)="search()">搜索</button>
+        </div>
+        <div>
+            <button mat-stroked-button (click)="ok()">确定</button>
         </div>
     </div>
     <div class="listbox">
-
+        <ul>
+            <li *ngFor="let item of allUnitList" (click)="selected(item)">{{item.name}}</li>
+        </ul>
     </div>
 </div>

src/app/ui/add-six-familiar/add-six-familiar.component.html

@@ -4,32 +4,32 @@
         <mat-list class="list" role="list">
             <mat-list-item role="listitem">
                 <span class="name">熟悉对象</span> 
-                <input type="text" placeholder="请选择单位 >" (click)="openUnitList()">
+                <input type="text" placeholder="请选择单位 >" (click)="openUnitList()" [(ngModel)]="unitname">
             </mat-list-item>
             <mat-list-item role="listitem">
                 <span class="name">详细地址</span> 
-                <input type="text" placeholder="请输入详细地址">
+                <input type="text" placeholder="请输入详细地址" [(ngModel)]="address">
             </mat-list-item>
             <mat-list-item role="listitem">
                 <span class="name">联系人</span> 
-                <input type="text" placeholder="请输入联系人姓名">    
+                <input type="text" placeholder="请输入联系人姓名" [(ngModel)]="contactname">    
             </mat-list-item>
             <mat-list-item role="listitem">
                 <span class="name">联系人电话</span> 
-                <input type="text" placeholder="请输入联系电话">      
+                <input type="text" placeholder="请输入联系电话" [(ngModel)]="contactphone">      
             </mat-list-item>
             <mat-list-item role="listitem">
                 <span class="name">熟悉人员数量</span> 
-                <input type="text" placeholder="请输入人数">          
+                <input type="text" placeholder="请输入人数" [(ngModel)]="peoplenum">          
             </mat-list-item>
             <mat-list-item role="listitem">
                 <span class="name">带队领导</span> 
-                <input type="text" placeholder="请输入带队人姓名">
+                <input type="text" placeholder="请输入带队人姓名" [(ngModel)]="leadname">
             </mat-list-item>
         </mat-list>
         <div class="btnbox">
-            <button class="ok">确认</button>
-            <button class="cancel">取消</button>
+            <button class="ok" (click)="ok()">确认</button>
+            <button class="cancel" (click)="cancel()">取消</button>
         </div>
     </div>
     

src/app/ui/add-six-familiar/add-six-familiar.component.scss

@@ -63,13 +63,30 @@
     width: 7.617188rem;
     height: 5.859375rem;
     .topbox{
+        height: 0.488281rem;
+        line-height: 0.488281rem;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 1px solid black;
         span{
             font-size: 0.15625rem;
         }
         input{
-            height: 20px;
-            line-height: 20px;
+            height: 0.195313rem;
+            line-height: 0.195313rem;
             font-size: 0.15625rem;
         }
     }
+    .listbox{
+        height: 5.3rem;
+        overflow-y: auto;
+        li{
+            z-index: 888;
+            font-size: 0.175781rem;
+            margin: 3px 0;
+        }
+        li:hover{
+            background-color: #FC7045;
+        }
+    }
 }

src/app/ui/add-six-familiar/add-six-familiar.component.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit, Inject } from '@angular/core';
-import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 @Component({
   selector: 'app-add-six-familiar',
   templateUrl: './add-six-familiar.component.html',
@@ -11,15 +11,43 @@ export class AddSixFamiliarComponent implements OnInit {
 
   constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
   title:String = "新增六熟悉记录"
+
+  unitname:any
+  address:any
+  contactname:any
+  contactphone:any
+  peoplenum:any
+  leadname:any
   ngOnInit(): void {
   }
   //选择单位
   openUnitList(){
     let dialogRef = this.dialog.open(SelectUnit);
     dialogRef.afterClosed().subscribe(data=>{
-    
+      if(data){
+        this.unitname = data.name
+        this.address = data.address
+        this.contactname = data.contacts
+        this.contactphone = data.phone
+      }
     });  
   }
+  //确定
+  ok(){
+    console.log(this.unitname)
+    if(this.unitname && this.address && this.contactname && this.contactphone && this.peoplenum && this.leadname){
+     
+    }else{
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('存在未填项','确定',config)
+    }
+  }
+  //取消
+  cancel(){
+
+  }
 }
 
 
@@ -34,9 +62,43 @@ export class SelectUnit {
 
   constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef<SelectUnit>,@Inject(MAT_DIALOG_DATA) public data) { }
   
-
+  unitName:any //输入的单位名
+  allUnitList:any
   ngOnInit(): void {
+    this.getAllKeyUnit()
+  }
+  //获得所有单位
+  getAllKeyUnit(){
+    let paramsdata:any = {
+      Name: this.unitName || '',
+      OrganizationId: '',
+      HasChildren: '',
+      USCI:'',
+      IsFollowed: '',
+      BuildingTypeId: '',
+      PageNumber:'1',
+      PageSize:  100,
+      Sort: ''
+    }
+    this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+      this.allUnitList = data.items
+      console.log(789,data.items)
+    })
+  }
+
 
+  selectedUnit:any//选中的单位
+  selected(item){
+    this.selectedUnit = item
+    console.log(item)
   }
 
+  //搜索
+  search(){
+    this.getAllKeyUnit()
+  }
+  //确定选择
+  ok(){
+    this.dialogRef.close(this.selectedUnit);
+  }
 }

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

@@ -0,0 +1,24 @@
+<div class="bigbox">
+    <div class="title">
+        <app-title [title]="title"></app-title>
+    </div>
+    
+    <div class="content">
+        <div class="cardbox">
+            <mat-tab-group>
+                <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>
+                <mat-tab label="水源道路情况"> 水源道路情况 </mat-tab>
+                <mat-tab label="重点部位情况"> 重点部位情况 </mat-tab>
+                <mat-tab label="发现问题"> 发现问题 </mat-tab>
+                <mat-tab label="现场照片"> 现场照片 </mat-tab>
+            </mat-tab-group>
+        </div>
+    </div>
+</div>

src/app/ui/training-recordinfo/training-recordinfo.component.scss

@@ -0,0 +1,23 @@
+.bigbox{
+    width: 10rem;
+    height: 100%;
+    background: #F4F5F9;
+    overflow: hidden;
+    .title{
+        width: 10rem;
+        height: 0.585938rem;
+
+    }
+    .content{
+        width: 10rem;
+        height: 6.71875rem; 
+        .cardbox{
+            margin: 0 auto;
+            margin-top:0.195313rem;
+            background-color: #fff;
+            border-radius: 0.048828rem;
+            width:9.570313rem;
+            height: 6.523438rem;
+        }
+    }
+}

src/app/ui/training-recordinfo/training-recordinfo.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TrainingRecordinfoComponent } from './training-recordinfo.component';
+
+describe('TrainingRecordinfoComponent', () => {
+  let component: TrainingRecordinfoComponent;
+  let fixture: ComponentFixture<TrainingRecordinfoComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TrainingRecordinfoComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TrainingRecordinfoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/ui/training-recordinfo/training-recordinfo.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-training-recordinfo',
+  templateUrl: './training-recordinfo.component.html',
+  styleUrls: ['./training-recordinfo.component.scss']
+})
+export class TrainingRecordinfoComponent implements OnInit {
+
+  constructor() { }
+  title:any = "训练记录信息"
+  ngOnInit(): void {
+  }
+
+}

src/app/ui/ui.module.ts

@@ -62,8 +62,9 @@ import { saveOneDialog, saveTwoDialog } from './collection-tools/save';
 import { AddSixFamiliarComponent, SelectUnit } from './add-six-familiar/add-six-familiar.component';
 import { TitleComponent } from './title/title.component'
 import { HomeComponent } from './home/home.component';
+import { TrainingRecordinfoComponent } from './training-recordinfo/training-recordinfo.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],
+  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: [