[新增]添加二维预案单选界面

src/app/examiner/create-test-score/addPlanTwo.html

@@ -5,20 +5,15 @@
         </div>
         <div class="tablebox">
             <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
+                <!-- <mat-radio-group class="example-radio-group" [(ngModel)]="selectedradio"> -->
+
                     <!-- Checkbox Column -->
                     <ng-container matColumnDef="select">
                         <th mat-header-cell *matHeaderCellDef>
-                    <!-- <mat-checkbox (change)="$event ? masterToggle() : null"
-                                    [checked]="selection.hasValue() && isAllSelected()"
-                                    [indeterminate]="selection.hasValue() && !isAllSelected()">
-                    </mat-checkbox> -->
                         选择
                         </th>
-                    <td mat-cell *matCellDef="let row">
-                    <mat-checkbox color="primary" (click)="$event.stopPropagation()"
-                                    (change)="$event ? selection.toggle(row) : null"
-                                    [checked]="selection.isSelected(row)">
-                    </mat-checkbox>
+                        <td mat-cell *matCellDef="let row;">
+                            <mat-radio-button color="primary" (change)="radioChange(row)"></mat-radio-button>
                         </td>
                     </ng-container>
 
@@ -31,25 +26,28 @@
                     <!-- people Column -->
                     <ng-container matColumnDef="people">
                         <th mat-header-cell *matHeaderCellDef> 添加人 </th>
-                    <td mat-cell *matCellDef="let element"> {{element.people}} </td>
+                        <td mat-cell *matCellDef="let element"> {{element.creatorName}} </td>
                     </ng-container>
 
                     <!-- time Column -->
                     <ng-container matColumnDef="time">
                         <th mat-header-cell *matHeaderCellDef> 添加时间 </th>
-                    <td mat-cell *matCellDef="let element"> {{element.time}} </td>
+                        <td mat-cell *matCellDef="let element"> {{element.creationTime | date:'yyyy-MM-dd'}} </td>
                     </ng-container>
 
                     <!-- level Column -->
                     <ng-container matColumnDef="level">
                         <th mat-header-cell *matHeaderCellDef> 编制级别 </th>
-                    <td mat-cell *matCellDef="let element"> {{element.level}} </td>
+                        <td mat-cell *matCellDef="let element"> {{element.planLevel | planlevel}} </td>
                     </ng-container>
 
                     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                     <tr mat-row *matRowDef="let row; columns: displayedColumns;"
-                    (click)="selection.toggle(row)">
+                        >
                     </tr>
+                <!-- </mat-radio-group> -->
+
+               
             </table>
         </div>
     </div>

src/app/examiner/create-test-score/create-test-score.component.html

@@ -42,7 +42,7 @@
                                 <!-- 选择的单位名称 -->
                                 <p class="colorspan" style="margin: 0 0 12px 6px;">{{unit.name}}</p> 
                                 <!-- 基本信息 -->
-                                <mat-accordion>
+                                <mat-accordion *ngIf="unit.basicInfoNodes && unit.basicInfoNodes.length != 0">
                                     <mat-expansion-panel style="box-shadow: 0 0 black;" expanded>
                                     <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F5FDFE;">
                                         <mat-panel-title>
@@ -86,7 +86,7 @@
                                     </mat-expansion-panel>
                                 </mat-accordion>
                                 <!-- 四周毗邻 -->
-                                <mat-accordion *ngIf="unit.aroundNodes.length != 0">
+                                <mat-accordion *ngIf="unit.aroundNodes && unit.aroundNodes.length != 0">
                                     <mat-expansion-panel style="box-shadow: 0 0 black;" expanded>
                                     <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F5FDFE;">
                                         <mat-panel-title>
@@ -128,7 +128,7 @@
                                     </mat-expansion-panel>
                                 </mat-accordion>
                                 <!-- 重点部位 -->
-                                <mat-accordion *ngIf="unit.keySiteNodes.length != 0">
+                                <mat-accordion *ngIf="unit.keySiteNodes && unit.keySiteNodes.length != 0">
                                     <mat-expansion-panel style="box-shadow: 0 0 black;" expanded>
                                     <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F5FDFE;">
                                         <mat-panel-title>
@@ -170,7 +170,7 @@
                                     </mat-expansion-panel>
                                 </mat-accordion>
                                 <!-- 功能分区 -->
-                                <mat-accordion *ngIf="unit.funDivNodes.length != 0">
+                                <mat-accordion *ngIf="unit.funDivNodes && unit.funDivNodes.length != 0">
                                     <mat-expansion-panel style="box-shadow: 0 0 black;" expanded>
                                     <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F5FDFE;">
                                         <mat-panel-title>
@@ -212,7 +212,7 @@
                                     </mat-expansion-panel>
                                 </mat-accordion>
                                 <!-- 数据核验（消防设施） -->
-                                <mat-accordion *ngIf="unit.fireFacNodes .length != 0">
+                                <mat-accordion *ngIf="unit.fireFacNodes && unit.fireFacNodes .length != 0">
                                     <mat-expansion-panel style="box-shadow: 0 0 black;" expanded>
                                     <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F5FDFE;">
                                         <mat-panel-title>

src/app/examiner/create-test-score/create-test-score.component.ts

@@ -23,6 +23,11 @@ export class CreateTestScoreComponent implements OnInit {
     this.selectedTab = index
   }
   ngOnInit(): void {
+    // this.getUnitData()
+    // .then(()=>{
+    //   this.getAround()
+    // })
+
     this.getUnitData()
     this.getAround()
     this.getKeySite()
@@ -34,56 +39,6 @@ export class CreateTestScoreComponent implements OnInit {
   clickUnitName(key){
     this.selectedUnitIndex = key
   }
-  //模拟单位数据
-  unitDatas:any = [
-    {name:'富丽华大酒店1',score:0,basicInfoScore:0,basicInfoItemScore:0,basicInfoNodes : [
-      {
-        name: '单位信息',
-        key: '0-0',
-        type:'基本信息',
-        expanded: true,
-        children: [
-          {name: '统一社会信用代码',key: '1',isLeaf:true},
-          {name: '单位类型',key: '2',isLeaf:true},
-          {name: '联系人',key: '3',isLeaf:true},
-          {name: '联系电话',key: '4',isLeaf:true},
-          {name: '辖区中队',key: '5',isLeaf:true},
-          {name: '单位地址',key: '6',isLeaf:true}
-        ]
-      },
-      {
-        name: '建筑信息',
-        key: '0-1',
-        type:'基本信息',
-        expanded: true,
-        children: [
-          { name: '面积', key: '0-1-0-0',isLeaf:true},
-          { name: '高度', key: '0-1-0-1',isLeaf:true},
-          { name: '层数', key: '0-1-0-2',isLeaf:true}
-        ]
-      },
-    ],aroundScore:0,aroundItemScore:0,aroundNodes :[
-      {
-        name: '单位四周毗邻',
-        key: '11',
-        expanded: true,
-        type:'四周毗邻',
-        children: [
-          {name: '东方向',key: '55',isLeaf:true},
-        ]
-      },
-      {
-        name: '建筑四周毗邻',
-        key: '22',
-        expanded: true,
-        type:'四周毗邻',
-        children: [
-          {name: '东方向',key: '55',isLeaf:true},
-        ]
-      },
-    ]},
-    // {name:'富丽华大酒店2',score:0,basicInfoScore:0}
-  ]
 
   //上个页面传过来的单位数据
   // unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'},
@@ -91,15 +46,16 @@ export class CreateTestScoreComponent implements OnInit {
   //               {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'}
   //             ]
   unitId:any = JSON.parse(localStorage.getItem('checkedWork')) 
+
   //获取单位基本信息
    getUnitData(){
+  
       this.unitId.forEach((element,index) => {
         element.score = 0
         element.basicInfoScore = 0
         element.basicInfoItemScore = 0
   
         this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{
-        // console.log('单位信息',index,data)
           let unitData = {
             name: '单位信息',
             type:'基本信息',
@@ -145,10 +101,8 @@ export class CreateTestScoreComponent implements OnInit {
                     buildingType:data[i].buildingTypes[0].id
                   }
                 }).subscribe((buildingsData:any)=>{
-                // console.log(1234,buildingsData)
                   buildingsData.name = data[i].name
                   buildingsData.buildingType = data[i].buildingTypes[0].name
-                
                   buildingsData[0].buildingBasicGroups.forEach((y,m) => {
                     let propertyInfosArr = []
                     let tabledata
@@ -217,15 +171,18 @@ export class CreateTestScoreComponent implements OnInit {
                 })
               })
             }
-          // console.log(987,this.unitId)
           })
     
         }) 
         
       })
+ 
+
+    
   }
   //获取四周毗邻数据
   getAround(){
+    
       this.unitId.forEach((element,index) => {
         element.aroundScore = 0
         element.aroundItemScore = 0
@@ -301,6 +258,7 @@ export class CreateTestScoreComponent implements OnInit {
 
         }
       })
+
   }
   //获取重点部位
   getKeySite(){
@@ -719,10 +677,13 @@ export class CreateTestScoreComponent implements OnInit {
 
   //添加预案
   addPlan(){
+    let companyId = {
+      companyId : this.unitId[this.selectedUnitIndex].id
+    }
     const dialogRef = this.dialog.open(AddPlanDialog, {
       width: '380px',
       height: '136px',
-      data: {}
+      data: companyId
     });
 
     dialogRef.afterClosed().subscribe(result => {
@@ -1028,14 +989,13 @@ export class CreateTestScoreComponent implements OnInit {
      console.log(paperDataInfo) 
 
     const dialogRef = this.dialog.open(FinishDialog, {
-      width: '700px',
-      height: '300px',
+      width: '650px',
       data: paperDataInfo
     });
 
     dialogRef.afterClosed().subscribe(result => {
       console.log('The dialog was closed');
-      this.router.navigate(['/home/createexam-index']) //跳转试卷列表页面
+      
     });
   }
   //上一步
@@ -1064,9 +1024,13 @@ export class AddPlanDialog {
 
   //选择想要添加的预案类型 （已存在或者自定义）
   selectType(type){
+    let obj = {
+      type:type,
+      companyId:this.data.companyId
+    }
     const dialogRef = this.dialog.open(AddPlanTwoDialog, {
       id:'addPlanTwo',
-      data: {type}
+      data: obj
     });
 
     dialogRef.afterClosed().subscribe(result => {
@@ -1075,12 +1039,6 @@ export class AddPlanDialog {
   }
 }
 
-const ELEMENT_DATA: any = [
-  {id: 1, name: '五楼电梯故障', people:'上海总队',time:'2020-06-15',level:'总队'},
-  {id: 2, name: '故障搜救', people:'超级管理员',time:'2020-06-15',level:'总队'},
-  {id: 3, name: '故障搜救', people:'超级管理员',time:'2020-06-15',level:'总队'},
-  {id: 4, name: '五楼电梯故障', people:'上海总队',time:'2020-06-15',level:'总队'},
-];
 
 //添加预案2
 @Component({
@@ -1090,25 +1048,32 @@ const ELEMENT_DATA: any = [
 })
 export class AddPlanTwoDialog {
 
-  constructor(public dialog: MatDialog,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
+  constructor(private http: HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
 
   planType:any = this.data.type == 1 ? true : false//显示的预案类型
   displayedColumns: string[] = ['select', 'name', 'people', 'time', 'level'];
-  dataSource = new MatTableDataSource<any>(ELEMENT_DATA);
-  selection = new SelectionModel<any>(true, []);
-  isAllSelected() {
-    const numSelected = this.selection.selected.length;
-    const numRows = this.dataSource.data.length;
-    return numSelected === numRows;
-  }
-
-  masterToggle() {
-    this.isAllSelected() ?
-        this.selection.clear() :
-        this.dataSource.data.forEach(row => this.selection.select(row));
+  dataSource : any //列表数据
+  selectedradio
+  radioChange(e){
+    console.log(e)
   }
   ngOnInit(): void {
+    // console.log(this.data.companyId)
+    this.get2DPlan()
+  }
 
+  //获取当前公司的二维预案
+  get2DPlan(){
+    let planArr = []
+    this.http.get('/api/PlanComponents',{params:{
+      companyId:this.data.companyId
+    }}).subscribe((data:any) => {
+      console.log(123,data)
+      data.items.forEach(item => {
+        item.planType == 1 ? planArr.push(item) : null
+      })
+      this.dataSource = planArr
+    })
   }
 
   onNoClick(): void {
@@ -1117,7 +1082,7 @@ export class AddPlanTwoDialog {
   //确定
   confirm(){
     if(this.planType == 1){
-      console.log(this.selection)
+      
     }else{
 
     }
@@ -1137,9 +1102,8 @@ export class AddPlanTwoDialog {
 })
 export class FinishDialog{
 
-  constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
+  constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<AddPlanTwoDialog>,@Inject(MAT_DIALOG_DATA) public data: any) {}
   ngOnInit(): void {
-    // console.log( new Date())
     this.getProfiles()
   }
   //获取登录账号的个人资料
@@ -1198,6 +1162,7 @@ export class FinishDialog{
         this.http.post('/api/Papers',params).subscribe(data => {
           this.snackBar.open('创建成功','确定',config);
           this.dialogRef.close();
+          this.router.navigate(['/home/createexam-index']) //跳转试卷列表页面
         },err => {
           this.snackBar.open(err,'确定',config);
         })
@@ -1235,6 +1200,9 @@ export class FinishDialog{
   getWeek(result: Date[]): void {
     console.log('week: ', result.map(getISOWeek));
   }
+  close(){
+    this.dialogRef.close();
+  }
 }
 
 //查看答案

src/app/examiner/create-test-score/finishDialog.html

@@ -8,18 +8,18 @@
 -->
 <div class="box">
     <div class="diaone">
-        <div><label>请填写试卷类型：</label></div>
+        <div style="margin-bottom: 5px;"><label>请填写试卷类型:</label></div>
         <div><input  placeholder="请填写" [(ngModel)]="examName"></div>
     </div>
     <div class="diatwo">
         <div class="starttime">
-        <div><label>请选择开始时间</label></div>
+        <div style="margin-bottom: 5px;"><label>请选择开始时间:</label></div>
         <!-- <div><nz-range-picker class="datepicker" nzFormat="yyyy-MM-dd HH:mm"   [nzShowTime]="{ nzHideDisabledOptions: true, nzDefaultOpenValue: timeDefaultValue }" [nzDisabledTime]="disabledDateTime" [(ngModel)]="date" (ngModelChange)="onChange($event)"></nz-range-picker>
         </div> -->
         <div><input type="datetime-local" name="start_time" value="" [(ngModel)]="startTime" /></div>
         </div>
         <div class="endtime">
-            <div><label>请选择结束时间</label></div>
+            <div style="margin-bottom: 5px;"><label>请选择结束时间:</label></div>
             <div><input type="datetime-local" name="end_time" value=""  [(ngModel)]="endTime"/></div>
         </div>
         
@@ -27,6 +27,6 @@
     
     <div mat-dialog-actions style="margin-top: 20px;">
         <button mat-button (click)="onNoClick()" style="background-color: #07CDCF;margin-left: 200px;color: #fff;">确定</button>
-        <button mat-button [mat-dialog-close]="data.animal" style=" background-color: #FF8678;margin-left: 25px;color: #fff;">取消</button>
+        <button mat-button type="button" (click)="close()" style=" background-color: #FF8678;margin-left: 25px;color: #fff;">取消</button>
     </div>
 </div>

src/app/examiner/examiner.module.ts

@@ -52,9 +52,10 @@ import { NzTreeModule } from 'ng-zorro-antd/tree';
 import { ExaminerIndexComponent } from './examiner-index/examiner-index.component';
 import { ExaminerNewOneComponent } from './examiner-new-one/examiner-new-one.component';
 import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
+import { PlanLevel } from '../pipes/size.pipe';
 
 @NgModule({
-  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog],
+  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel],
   imports: [
     CommonModule,
     examinerRoutingModule,

src/app/pipes/size.pipe.ts

@@ -56,3 +56,21 @@ export class testState implements PipeTransform {
         }
     }
 }
+
+export enum PlanLevelEnum {
+    "编制级别0",
+    "总队",
+    "支队",
+    "编制级别3",
+    "大队",
+    "编制级别5",
+    "编制级别6",
+    "编制级别7",
+    "中队"
+}
+@Pipe({name: 'planlevel'})
+export class  PlanLevel implements PipeTransform {
+    transform(value: number): string {
+        return PlanLevelEnum[value]
+    }
+}