diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 24a609a..faf2baa 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -354,7 +354,7 @@ export class KeyUnitManagementComponent implements OnInit {
   ]
 
   allKeyUnitInfo:any //所有的重点单位
-  IsNewData=true//是否是新增或者维护更新
+  IsNewData:boolean//是否是新增或者维护更新
   getAllKeyUnit(){
     // console.log(Boolean(Number(this.follow)))
     let follow 
@@ -379,7 +379,7 @@ export class KeyUnitManagementComponent implements OnInit {
       PageSize:  this.pageSizeOptions[0],
       Sort: this.integritySort ? 'integrityscore' : '',
       SortType: this.integritySort || '',
-      IsNewData:this.IsNewData,
+      //IsNewData:this.IsNewData,
       IntegrityScoreMin:this.integrityScoreMin/100||0,
       IntegrityScoreMax:this.integrityScoreMax/100||1
     }
@@ -652,6 +652,8 @@ export class KeyUnitManagementComponent implements OnInit {
     this.integritySort = ''
     this.integrityScoreMax=undefined
     this.integrityScoreMin=undefined
+    this.IsNewData=undefined
+    
     this.getAllKeyUnit();
   }
   //编辑单位名称
@@ -687,7 +689,44 @@ export class KeyUnitManagementComponent implements OnInit {
     if(this.integrityScoreMax<this.integrityScoreMin){
       this.snackBar.open('最大值不能小于最小值!','确定',config);
     }else{
-      this.getAllKeyUnit();
+      let follow 
+    if(this.follow == ''){
+      follow = ''
+    }
+    if(this.follow == '0'){
+      follow = false
+    }
+    if(this.follow == '1'){
+      follow = true
+    }
+
+    let paramsdata:any = {
+      Name: this.companyName || '',
+      OrganizationId: this.jsId || '',
+      HasChildren:this.jscheck || '',
+      USCI:this.shehui || '',
+      IsFollowed: follow,
+      BuildingTypeId:  this.unittype || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize:  this.pageSizeOptions[0],
+      Sort: this.integritySort ? 'integrityscore' : '',
+      SortType: this.integritySort || '',
+      IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+      IntegrityScoreMin:this.integrityScoreMin/100||0,
+      IntegrityScoreMax:this.integrityScoreMax/100||1
+    }
+    this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+      this.length = data.totalCount
+      this.allKeyUnitInfo = data
+      // data.items.sort( (a,b) => {
+      //   return a.usci - b.usci
+      // })
+      data.items.forEach( (item,index) => {
+        item.integrity = this.wanzhengduArr[index]
+      })
+      //console.log(789,data.items)
+      this.tabledataSource = new MatTableDataSource(data.items);
+    })
     }
     
   }
diff --git a/src/app/plan-management/create-plan-online-five/addattinf.html b/src/app/plan-management/create-plan-online-five/addattinf.html
index f25d104..3e8d452 100644
--- a/src/app/plan-management/create-plan-online-five/addattinf.html
+++ b/src/app/plan-management/create-plan-online-five/addattinf.html
@@ -13,12 +13,12 @@
     
     <div class="center" *ngIf="this.data.element!=undefined&& this.data.element.surveyName=='建筑信息'">
         <div class="group" *ngFor="let item of addAttinfBuild" >
-            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.propertyName}}</mat-checkbox>
+            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" *ngIf="item.zdy==undefined">{{item.propertyName}}</mat-checkbox>
         </div>
     </div>
     <div class="center" *ngIf="this.data.element!=undefined&& this.data.element.surveyName=='消防设施'">
         <div class="group" *ngFor="let item of addAttinfFile" >
-            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.name}}</mat-checkbox>
+            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" *ngIf="item.zdy==undefined">{{item.name}}</mat-checkbox>
         </div>
     </div>
     <div class="center" *ngIf="this.data.facilityItems!=null">
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
index 1a3f107..739b008 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
@@ -717,6 +717,7 @@
                                     height: 40px;
                                     line-height: 40px;">{{itemunit.name}}</span>
                                     <img src="../../../assets/images/update.png" *ngIf="planMode==4&&pattern == 'edit'" (click)='unitZdyaaa()'>
+                                    <span style="float: right;margin-right: 30px;cursor: pointer;" (click)='zdyDw()'>自定义</span>
                                 </div>
                                 <div class="unitbody" *ngFor="let element of itemunit.body;let elei=index" style=" height: 100%;
                                 width: 100%;
@@ -737,6 +738,7 @@
                                             <img src="../../../assets/images/updatabai.png" (click)='addBuildingmb(element)' *ngIf="planMode==4&&pattern == 'edit'&&(element.surveyName=='建筑信息'||element.surveyName=='消防设施')">
                                             <img src="../../../assets/images/addbai.png"
                                                 (click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'">
+                                            
                                         </div>
                                         <div class="body">
                                             <!-- 进攻通道 -->
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index c22d857..600ec4a 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -21,6 +21,7 @@ import Viewer from 'viewerjs';
 import { async } from 'rxjs/internal/scheduler/async';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { adddwsurvey, addGroup } from '@src/app/ui/plan-template/plan-template.component';
+import { zdyaddattinf } from '../../ui/plan-template/plan-template.component'
 declare var $: any
 @Component({
   selector: 'app-create-plan-online-five',
@@ -1947,14 +1948,34 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       });
       dialogRef.afterClosed().subscribe(result => {
         console.log(result)
-        this.planTemplateData[index].building[this.clicki].body.forEach(element => {
-          if(element.surveyName=='消防设施'){
-            element.attinf[filei].facilityItems=result
-          }
-        });
+        if(result!=undefined){
+          this.planTemplateData[index].building[this.clicki].body.forEach(element => {
+            if(element.surveyName=='消防设施'){
+              element.attinf[filei].facilityItems=result
+            }
+          });
+        }
+        
       })
     }
   }
+  //单位概况自定义
+  zdyDw(){
+    let index = this.getArrayIndex(this.planTemplateData,'单位概况')
+    const dialogRef = this.dialog.open(zdyaddattinf, {//调用open方法打开对话框并且携带参数过去
+      width: '340px',
+      height:'200px',
+      disableClose:true,
+      //data:this.planTemplateData
+    });
+    dialogRef.afterClosed().subscribe(result => {
+      if(result!=undefined){
+        this.planTemplateData[index].building[this.clicki].body.push({surveyName:result.groupName,completed: true,attinf:[],zdy:true})
+      }
+      
+    })
+    
+  }
 }
 
 
@@ -2182,6 +2203,7 @@ export class adddwsurveys{
   filenewDate=[]
   facilityItems
   facilityCategoryId//消防设施内容id
+  zdyData//模板传过来自定义的数据
   ngOnInit(): void{
     this.getinf()
     console.log(this.data)
@@ -2208,10 +2230,15 @@ export class adddwsurveys{
         })
       }else if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf!=undefined){
         this.buildnewDate=[] //接受接口返回的新数据
-        this.addAttinfBuild=this.data.element.attinf //模板传过来的数据
+        this.addAttinfBuild=this.data.element.attinf.filter(item=>{
+          return item.zdy==undefined
+        }) //模板传过来的非自定义数据
+        this.zdyData=this.data.element.attinf.filter(item=>{
+          return item.zdy!=undefined
+        })//模板传过来自定义数据
         this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild))
         let paramsdata:any ={
-          categoryId:this.data.buildingId
+          categoryId:this.data.buildingID
         }
         /* 请求接口，做差异化对比 */
         let restlt=await new Promise((resolve) => {
@@ -2255,6 +2282,7 @@ export class adddwsurveys{
               this.addAttinfBuild.splice(addi,1)
             }
           })
+          this.addAttinfBuild.push(...this.zdyData)
           console.log(this.buildnewDate)
           console.log(this.addAttinfBuild)
         
@@ -2280,16 +2308,22 @@ export class adddwsurveys{
           });
         })
         
-      }else if(this.data.surveyName=='消防设施'&&this.data.attinf!=undefined){
+      }else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf!=undefined){
         this.filenewDate=[]
-        this.addAttinfFile=this.data.attinf
+        this.addAttinfFile=this.data.element.attinf.filter(element => {
+         return element.zdy==undefined
+        });
+        this.zdyData=this.data.element.attinf.filter(element => {
+          return element.zdy!=undefined
+         });
         this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile))
+        console.log(this.addAttinfFile)
         this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
           buildData.forEach(async element => {
             if(element.id==this.data.fid){
               this.facilityCategoryId=element.facilityCategoryId
               let paramsdata:any ={
-                categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+                categoryId:this.facilityCategoryId
               }
               let restlt=await new Promise((resolve) => {
                 this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
@@ -2324,15 +2358,16 @@ export class adddwsurveys{
           this.addAttinfFile.forEach((addval,addi,addarr)=>{
             temp=0
             this.filenewDate.forEach((buildval,buindi,buildarr)=>{
-              if(buildarr[buindi].name==addarr[addi].name){
+              if(buildarr[buindi].id==addarr[addi].id){
                 temp++
               }
+              if(temp==0){
+                this.addAttinfFile.splice(addi,1)
+              }
             })
-            if(temp==0){
-              console.log(addarr[addi])
-              this.addAttinfFile.splice(addi,1)
-            }
+            
           })
+          this.addAttinfFile.push(...this.zdyData)
       }
     }else{
       //消防设施最里层数据
@@ -2379,11 +2414,12 @@ export class adddwsurveys{
               if(buildarr[buindi].name==addarr[addi].name){
                   temp++
               }
-            })
               if(temp==0){
                 console.log(addarr[addi])
                 this.facilityItems.splice(addi,1)
               }
+            })
+              
           })
         }
       })
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index f4ae373..45e896c 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -61,12 +61,12 @@
                             <input style="width: 175px;" type="file" name="" id="uploadFile" *ngIf="isup" (change)="filechange($event)">
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
-                        <!-- <div *ngIf="inputword">
+                        <div *ngIf="inputword">
                           <mat-radio-button value="2" style="margin-right: 10px;">模板在线编制</mat-radio-button>
                         </div>
                         <div *ngIf="inputNew">
                           <mat-radio-button value="4" style="margin-right: 10px;">自定义在线编制</mat-radio-button>
-                        </div> -->
+                        </div>
 
                         <!-- <div *ngIf="inputword">
                           <mat-radio-button value="1" style="margin-right: 10px;">导入word文档</mat-radio-button>
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index f38a9b6..4fe374a 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -93,7 +93,7 @@
                         <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
                         <span (click)="upzhuanMb(element)" *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span>
                         <span (click)="editPlan(element)"
-                            [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span>
+                            [ngClass]="{'grey':element.planMode == '1' || !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
                         <span (click)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16">查看</span>
                         <span (click)="readFile(element)"
                             [ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span>
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts
index 55d790c..1b8eeb6 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.ts
+++ b/src/app/plan-management/entry-plan/entry-plan.component.ts
@@ -42,8 +42,8 @@ export class EntryPlanComponent implements OnInit {
   pageSize:any; //每页条数
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
-  IsNewData=true //预案维护更新或者新增
-  IsNewCompanyData=true//单位维护更新或者新增
+  IsNewData:boolean //预案维护更新或者新增
+  IsNewCompanyData:boolean//单位维护更新或者新增
 
 
   displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation'];
@@ -335,8 +335,8 @@ export class EntryPlanComponent implements OnInit {
       SortType: this.integritySort || '',
       HasPlanComponents:this.haveyuan||'',
       PlanCategories:this.planCategory,
-      IsNewData:this.IsNewData,
-      IsNewCompanyData:this.IsNewCompanyData
+      /* IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData */
     }
     this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{
 
@@ -358,7 +358,36 @@ export class EntryPlanComponent implements OnInit {
   onSubmit (value) {
     this.PageNumber = 1
     this.pageEvent.pageIndex = 0
-    this.getAllPlanInfo();
+    let reservePlanType
+    this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
+    if(this.reservePlanType && this.reservePlanType.length != 0){
+      reservePlanType = eval(this.reservePlanType.join("|"))
+    } 
+    let paramsdata:any = {
+      CompanyName: this.companyName || '',
+      OrganizationId: this.jsId || '',
+      HasChildrenOrganization:this.jscheck || '',
+      BuildingTypeId:  this.unittype || '',
+      PlanType: reservePlanType || '',
+      AuditStatus: this.toExamine || '',
+      PlanLevel:  this.preparelevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize:  this.pageSizeOptions[0],
+      Sort: this.integritySort ? 'integrityscore' : '',
+      SortType: this.integritySort || '',
+      HasPlanComponents:this.haveyuan||'',
+      PlanCategories:this.planCategory,
+      IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData==undefined?true:this.IsNewCompanyData
+    }
+    this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{
+
+      this.length = data.totalCount
+      this.allPlanInfo = data
+      
+      this.tabledataSource = data.items
+    })
   }
 
   companyName:any //单位名称
@@ -373,8 +402,8 @@ export class EntryPlanComponent implements OnInit {
   planCategory=[] //预案级别
   //重置
   reset(){
-    this.IsNewCompanyData=true
-    this.IsNewData=true
+    this.IsNewCompanyData=undefined
+    this.IsNewData=undefined
     this.companyName = ''
     this.js = ''
     this.jsId = ''
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts
index 41c1501..92c4845 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -9,6 +9,7 @@ import { PageEvent } from '@angular/material/paginator';
 import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { TreeService } from '../../http-interceptors/tree.service'
+import { unwatchFile } from 'fs';
 declare var CryptoJS
 @Component({
   selector: 'app-meet-plan',
@@ -82,7 +83,7 @@ export class MeetPlanComponent implements OnInit {
 
   preparelevels: any
   plcheck: boolean //编制级别勾选框
-  IsNewData=true //维护更新活新增
+  IsNewData:boolean //维护更新活新增
   displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
   tabledataSource
   typePlan//新预案类型
@@ -141,7 +142,7 @@ export class MeetPlanComponent implements OnInit {
       HasChildrenPlanLevel: this.plcheck || '',
       PageNumber: this.PageNumber || '1',
       PageSize: this.pageSizeOptions[0],
-      IsNewData:this.IsNewData,
+      //IsNewData:this.IsNewData,
     }
     this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
       this.length = data.totalCount
@@ -164,7 +165,30 @@ export class MeetPlanComponent implements OnInit {
     } else {
       this.PageNumber = 1
       this.pageEvent.pageIndex = 0
-      this.getAlltabledate();
+      let reservePlanType
+    this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
+    if (this.reservePlanType && this.reservePlanType.length != 0) {
+      reservePlanType = eval(this.reservePlanType.join("|"))
+    }
+    let paramsdata: any = {
+      Name: this.unitname || '',
+      planCategories: this.level || [6, 7],
+      //PlanType:reservePlanType||'',
+      DisasterType: this.typePlan || '',
+      CreatorName: this.addname || '',
+      AuditStatus: this.unitstate || '',
+      CreationTimeRangeStart: this.addtime || '',
+      CreationTimeRangeEnd: this.endtime || '',
+      PlanLevel: this.projectlevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize: this.pageSizeOptions[0],
+      IsNewData:this.IsNewData,
+    }
+    this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
+      this.length = data.totalCount
+      this.tabledataSource = data.items
+    })
     }
 
   }
@@ -344,7 +368,8 @@ export class MeetPlanComponent implements OnInit {
     this.reservePlanType = ''
     this.unitstate = ''
     this.projectlevel = ''
-    this.plcheck = false
+    this.plcheck = 
+    this.IsNewData=undefined
     this.getAlltabledate()
   }
   //新增预案弹窗
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
index 93cde8a..fa9a6a2 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
@@ -114,7 +114,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
   pageSize: any; //每页条数
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber: any; //第几页
-  IsNewData=true //维护更新活新增
+  IsNewData:boolean //维护更新活新增
 
   //获取表格数据
   getAlltabledate() {
@@ -136,7 +136,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
       HasChildrenPlanLevel: this.plcheck || '',
       PageNumber: this.PageNumber || '1',
       PageSize: this.pageSizeOptions[0],
-      IsNewData:this.IsNewData,
+      //IsNewData:this.IsNewData,
     }
     this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
       this.length = data.totalCount
@@ -175,7 +175,30 @@ export class OnetwoEntryPlanComponent implements OnInit {
     } else {
       this.PageNumber = 1
       this.pageEvent.pageIndex = 0
-      this.getAlltabledate();
+      let reservePlanType
+    this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
+    if (this.reservePlanType && this.reservePlanType.length != 0) {
+      reservePlanType = eval(this.reservePlanType.join("|"))
+    }
+    let paramsdata: any = {
+      Name: this.unitname || '',
+      planCategories: this.url == '2' ? 2 : 1,
+      //PlanType:reservePlanType||'',
+      DisasterType: this.typePlan || '',
+      CreatorName: this.addname || '',
+      AuditStatus: this.unitstate || '',
+      CreationTimeRangeStart: this.addtime || '',
+      CreationTimeRangeEnd: this.endtime || '',
+      PlanLevel: this.projectlevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize: this.pageSizeOptions[0],
+      IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+    }
+    this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
+      this.length = data.totalCount
+      this.tabledataSource = data.items
+    })
     }
 
   }
diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts
index 73c2ded..7c9d3f7 100644
--- a/src/app/plan-management/open-plan/open-plan.component.ts
+++ b/src/app/plan-management/open-plan/open-plan.component.ts
@@ -43,7 +43,7 @@ export class OpenPlanComponent implements OnInit {
   pageSize: any; //每页条数
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber: any; //第几页
-  IsNewData=true //维护更新活新增
+  IsNewData:boolean //维护更新活新增
 
   displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
 
@@ -129,8 +129,8 @@ export class OpenPlanComponent implements OnInit {
       PageNumber: this.PageNumber || '1',
       PageSize: this.pageSizeOptions[0],
       Sort: '',
-      IsNewData:this.IsNewData,
-      IsNewCompanyData:this.IsNewCompanyData
+      /* IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData */
     }
     this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
       // console.log(111,data)
@@ -269,7 +269,27 @@ export class OpenPlanComponent implements OnInit {
   }
   //查询
   onSubmit(e) {
-    this.getAllPlanInfo()
+    let paramsdata: any = {
+      CompanyName: this.companyName || '',
+      OrganizationId: '',
+      HasChildrenOrganization: '',
+      BuildingTypeId: this.unittype || '',
+      PlanType: this.reservePlanType || '',
+      AuditStatus: '', //审核状态
+      PlanLevel: this.preparelevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize: this.pageSizeOptions[0],
+      Sort: '',
+      IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData==undefined?true:this.IsNewCompanyData
+    }
+    this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
+      // console.log(111,data)
+      this.length = data.totalCount
+      this.allPlanInfo = data
+      this.tabledataSource = data.items
+    })
   }
   companyName: any //单位名称
   js: any //所选组织机构
@@ -293,8 +313,8 @@ export class OpenPlanComponent implements OnInit {
     this.pageEvent.pageIndex = 0
     this.PageNumber = 1
     this.getAllPlanInfo();
-    this.IsNewCompanyData=true
-    this.IsNewData=true
+    this.IsNewCompanyData=undefined
+    this.IsNewData=undefined
 
   }
 }
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts
index e4de4a6..81926bd 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -48,7 +48,7 @@ export class PassPlanComponent implements OnInit {
   allorganizations: any //所有组织机构
   allunittype: any //所有单位类型
   tabledataSource: any //表格数据
-  IsNewData=true //维护更新活新增
+  IsNewData:boolean //维护更新活新增
   url
 
   preparelevels: any
@@ -116,7 +116,7 @@ export class PassPlanComponent implements OnInit {
   }
 
   allPlanInfo: any //存储所有预案信息
-  IsNewCompanyData=true //单位是新增还是维护更新
+  IsNewCompanyData:boolean //单位是新增还是维护更新
   //获得所有预案信息
   getAllPlanInfo() {
     let reservePlanType
@@ -139,8 +139,8 @@ export class PassPlanComponent implements OnInit {
       PageSize: this.pageSizeOptions[0],
       Sort: '',
       PlanCategories: this.planCategory,
-      IsNewData:this.IsNewData,
-      IsNewCompanyData:this.IsNewCompanyData
+      /* IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData */
     }
     this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
       this.length = data.totalCount
@@ -440,7 +440,34 @@ export class PassPlanComponent implements OnInit {
   onSubmit(e) {
     this.PageNumber = 1
     this.pageEvent.pageIndex = 0
-    this.getAllPlanInfo();
+    let reservePlanType
+    this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
+    if (this.reservePlanType && this.reservePlanType.length != 0) {
+      reservePlanType = eval(this.reservePlanType.join("|"))
+    }
+    let paramsdata: any = {
+      CompanyName: this.companyName || '',
+      OrganizationId: this.jsId || '',
+      HasChildrenOrganization: this.jscheck || '',
+      BuildingTypeId: this.unittype || '',
+      PlanType: this.reservePlanType || '',
+      AuditStatus: '', //审核状态
+      PlanLevel: this.preparelevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      CreationTimeRangeStart: this.addtime || '',
+      CreationTimeRangeEnd: this.endtime || '',
+      PageNumber: this.PageNumber || '1',
+      PageSize: this.pageSizeOptions[0],
+      Sort: '',
+      PlanCategories: this.planCategory,
+      IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData==undefined?true:this.IsNewCompanyData
+    }
+    this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
+      this.length = data.totalCount
+      this.allPlanInfo = data
+      this.tabledataSource = data.items
+    })
   }
   companyName: any //单位名称
   js: any //所选组织机构
@@ -453,8 +480,8 @@ export class PassPlanComponent implements OnInit {
   planCategory = []//预案级别
   //重置
   reset() {
-    this.IsNewData=true
-    this.IsNewCompanyData=true
+    this.IsNewData=undefined
+    this.IsNewCompanyData=undefined
     this.companyName = ''
     this.js = ''
     this.jsId = ''
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
index 77b9af6..394fb2b 100644
--- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
+++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
@@ -130,8 +130,8 @@ export class ReinforcePlanComponent implements OnInit {
       PageNumber: this.PageNumber || '1',
       PageSize:  this.pageSizeOptions[0],
       Sort: '',
-      IsNewData:this.IsNewData,
-      IsNewCompanyData:this.IsNewCompanyData
+      /* IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData */
     }
     this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
       // console.log('增援预案列表',data)
@@ -205,7 +205,29 @@ export class ReinforcePlanComponent implements OnInit {
   onSubmit (e) {
     this.PageNumber = 1
     this.pageEvent.pageIndex = 0
-    this.getAllPlanInfo();
+    let paramsdata:any = {
+      CompanyName: this.companyName || '',
+      OrganizationId: this.jsId || '',
+      HasChildrenOrganization:this.jscheck || '',
+      BuildingTypeId:  this.unittype || '',
+      PlanType: this.reservePlanType || '',
+      AuditStatus:'', //审核状态
+      PlanLevel:  this.preparelevel || '',
+      HasChildrenPlanLevel: this.plcheck || '',
+      CreationTimeRangeStart:this.addtime||'',
+      CreationTimeRangeEnd:this.endtime||'',
+      PageNumber: this.PageNumber || '1',
+      PageSize:  this.pageSizeOptions[0],
+      Sort: '',
+      IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData
+    }
+    this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
+      // console.log('增援预案列表',data)
+      this.length = data.totalCount
+      this.allPlanInfo = data
+      this.tabledataSource = data.items  
+    })
   }
   companyName:any //单位名称
   js:any //所选组织机构
@@ -217,8 +239,8 @@ export class ReinforcePlanComponent implements OnInit {
   plcheck:boolean //编制级别勾选框
   //重置
   reset(){
-    this.IsNewData=true
-    this.IsNewCompanyData=true
+    this.IsNewData=undefined
+    this.IsNewCompanyData=undefined
     this.companyName = ''
     this.js = ''
     this.jsId = ''
diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts
index 9408be0..3726bc9 100644
--- a/src/app/plan-management/type-plan/type-plan.component.ts
+++ b/src/app/plan-management/type-plan/type-plan.component.ts
@@ -89,7 +89,7 @@ export class TypePlanComponent implements OnInit {
   levels
   preparelevels: any
   plcheck: boolean //编制级别勾选框
-  IsNewData=true //维护更新活新增
+  IsNewData:boolean //维护更新活新增
   displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
   tabledataSource
   unitname//预案名称
@@ -122,7 +122,7 @@ export class TypePlanComponent implements OnInit {
       HasChildrenPlanLevel: this.plcheck || '',
       PageNumber: this.PageNumber || '1',
       PageSize: this.pageSizeOptions[0],
-      IsNewData:this.IsNewData,
+      //IsNewData:this.IsNewData,
     }
     this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
       this.length = data.totalCount
@@ -158,7 +158,23 @@ export class TypePlanComponent implements OnInit {
     } else {
       this.PageNumber = 1
       this.pageEvent.pageIndex = 0
-      this.getAlltabledate();
+      let paramsdata: any = {
+        Name: this.unitname || '',
+        planCategories: 8,
+        CreatorName: this.addname || '',
+        AuditStatus: this.unitstate || '',
+        CreationTimeRangeStart: this.addtime || '',
+        CreationTimeRangeEnd: this.endtime || '',
+        PlanLevel: this.projectlevel || '',
+        HasChildrenPlanLevel: this.plcheck || '',
+        PageNumber: this.PageNumber || '1',
+        PageSize: this.pageSizeOptions[0],
+        IsNewData:this.IsNewData==undefined?true:this.IsNewData,
+      }
+      this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
+        this.length = data.totalCount
+        this.tabledataSource = data.items
+      })
     }
 
   }