diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index 8b91086..984d467 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -9,36 +9,16 @@
                     </mat-form-field>
                 </div>
     
-                <div class="queryField ordiv">
-                    <label style="margin-right: 10px;">消防救援站:</label>
-                    <mat-form-field class="example-full-width">
-                        <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
+                <div class="queryField" >
+                    <label style="margin-right: 10px;">关注单位:</label>
+                    <mat-form-field>
+                        <mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
+                            <mat-option value="0">未关注</mat-option>
+                            <mat-option value="1">已关注</mat-option>
+                        </mat-select>
                     </mat-form-field>
-                    <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
                     <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
                     <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
-                    <div class="organizationbox" *ngIf="isorganizationbox">
-                        <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
-                        <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
-                                <button type="button" mat-icon-button disabled ></button>
-                                <li>{{node.name}}</li>
-                            </mat-tree-node>
-                            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                                <button 
-                                    type="button" 
-                                    mat-icon-button 
-                                    matTreeNodeToggle
-                                    [attr.aria-label]="'toggle ' + node.name">
-                                <mat-icon class="mat-icon-rtl-mirror">
-                                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-                                </mat-icon>
-                                </button>
-                                <li>{{node.name}}</li>
-                            </mat-tree-node>
-                        </mat-tree>  
-                    </div>
-                    
                 </div>
                 <div class="queryField" *ngIf="!pcfind">
                     <button mat-raised-button color="primary">查询</button>
@@ -66,14 +46,36 @@
                     <button mat-raised-button color="primary">查询</button>
                     <button mat-raised-button style="margin-left: 25px;" type="button"  (click)="reset()">重置</button>
                 </div>
-                <div class="queryField" *ngIf="!padMore&&!pcMore">
-                    <label style="margin-right: 10px;">关注单位:</label>
-                    <mat-form-field>
-                        <mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
-                            <mat-option value="0">未关注</mat-option>
-                            <mat-option value="1">已关注</mat-option>
-                        </mat-select>
+                
+                <div class="queryField ordiv" *ngIf="!padMore&&!pcMore">
+                    <label style="margin-right: 10px;">消防救援站:</label>
+                    <mat-form-field class="example-full-width">
+                        <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
                     </mat-form-field>
+                    <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
+                    
+                    <div class="organizationbox" *ngIf="isorganizationbox">
+                        <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+                        <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+                            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                                <button type="button" mat-icon-button disabled ></button>
+                                <li>{{node.name}}</li>
+                            </mat-tree-node>
+                            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
+                                <button 
+                                    type="button" 
+                                    mat-icon-button 
+                                    matTreeNodeToggle
+                                    [attr.aria-label]="'toggle ' + node.name">
+                                <mat-icon class="mat-icon-rtl-mirror">
+                                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                                </mat-icon>
+                                </button>
+                                <li>{{node.name}}</li>
+                            </mat-tree-node>
+                        </mat-tree>  
+                    </div>
+                    
                 </div>
                 <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <label style="margin-right: 10px;">信息完整度排序:</label>
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
index 8b8b4f2..fbfb257 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
@@ -1,6 +1,4 @@
 
-
-
 .header {
     width: 100%;
     padding: 12px 0 12px 10px;
@@ -9,7 +7,7 @@
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 0;
+      padding: 5px 10px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
@@ -25,7 +23,7 @@
           border-radius: 3px;}
           @media screen and (max-device-width:1400px){
             mat-form-field{
-                width: 110px;
+                width: 150px;
             }
         }
       }
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss
index 2c9ca4f..871331e 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.scss
+++ b/src/app/plan-audit/plan-record/plan-record.component.scss
@@ -13,97 +13,136 @@
             display: flex;
             flex-direction: column;
             .headdiv{
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     margin: 30px 0 0 28px;
                 }
-                @media screen and (max-device-width:1300px){
+                @media screen and (max-device-width:1400px){
                     margin-top: 10px;
                 }
                 height: 40px;
                 display: flex;
                 flex-direction: row;
                 span{
-                    font-size: 16px;
+                    @media screen and (min-device-width:1400px){
+                        font-size: 16px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        font-size: 13px;
+                    }
                     margin-left: 3px;
                 }
                 input{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 50px;
+                        top: 6px;
                     }
-                    @media screen and (max-device-width:1300px){
+                    @media screen and (max-device-width:1400px){
                         margin-left: 12px;
+                        top: 3px;
                     }
                     position: relative;
-                    top: 6px;
+                    
                 }
                 .count{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 110px;
                     }
-                    @media screen and (max-device-width:1300px){
+                    @media screen and (max-device-width:1400px){
                         margin-left: 20px;
+                        position: relative;
+                        bottom: 4px;
                     }
                 }
             }
             .headdivtwo{
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     margin: 0 0 0 28px;
                 }
-                @media screen and (max-device-width:1300px){
+                @media screen and (max-device-width:1400px){
                     margin-left: 0;
                 }
                 //height: 40px;
                 display: flex;
                 flex-direction: row;
                 span{
-                    font-size: 16px;
+                    @media screen and (min-device-width:1400px){
+                        font-size: 16px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        font-size: 13px;
+                    }
                     margin-left: 3px;
                 }
                 input{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 50px;
+                        top: 5px;
                     }
-                    @media screen and (max-device-width:1300px){
+                    @media screen and (max-device-width:1400px){
                         margin-left: 0;
+                        top: 3px;
                     }
                     position: relative;
-                    top: 5px;
+                    
+                    
                     left: 2px;
                 }
                 .count{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 110px;
                     }
-                    @media screen and (max-device-width:1300px){
+                    @media screen and (max-device-width:1400px){
                         margin-left: 20px;
                     }
                 }
             }
             .headthree{
                 height: 45px;
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     margin-left: 30px;
                 }
-                
-                mat-form-field{
-                    width: 150px;
+                @media screen and (max-device-width:1400px){
+                    font-size: 13px;
+                    mat-form-field{
+                        width: 120px;
+                    }
                 }
+                
             }
             .headfour{
-                
+                @media screen and (max-device-width:1400px){
+                    font-size: 13px;
+                    mat-form-field{
+                        width: 150px;
+                    }
+                }
                 span{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 30px;
                     }
                 }
                 button{
-                    @media screen and (min-device-width:1300px){
+                    @media screen and (min-device-width:1400px){
                         margin-left: 40px;
+                        font-size: 16px;
+                        width: 80px;
+                        height: 36px;
                     }
-                    @media screen and (max-device-width:1300px){
-                        margin-left: 120px;
+                    @media screen and (max-device-width:1400px){
+                        margin-left: 80px;
                     }
                 }
+                img{
+                    @media screen and (min-device-width:1400px){
+                        height: 14px;
+                        width: 14px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        height: 12px;
+                        width: 12px;
+                    }
+                    
+                }
             }
         }
         .tablediv{
@@ -113,7 +152,7 @@
             
             .tbodycss{
                 //overflow-y: auto;
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     overflow-y: auto;
                 }
                 height:550px;
@@ -135,7 +174,12 @@
                     //font-size: 16px;
                     th{
                         font-weight:10; 
-                        font-size:16px
+                        @media screen and (min-device-width:1400px){
+                            font-size: 16px;
+                        }
+                        @media screen and (max-device-width:1400px){
+                            font-size: 13px;
+                        }
                     }
                 }
                 
@@ -147,7 +191,7 @@
     }
     .boxright{
         height: 100%;
-        width: 55%;
+        width: 53%;
         flex: 1;
         background-color: #FFFFFF;
         margin-left: 10px;
@@ -190,7 +234,12 @@
 }
 th,td{
     height:48px;
-    font-size: 16px;
+    @media screen and (min-device-width:1400px){
+        font-size: 16px;
+    }
+    @media screen and (max-device-width:1400px){
+        font-size: 13px;
+    }
     text-align: center;
 }
 .green{color: #00C756;}
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index 133bb25..c81b24e 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -4,16 +4,14 @@
           <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
             <div class="headdiv" style="margin-top: 30px;">
               <span>操作类型：</span>
+              <!-- <div></div>
+              <div></div>
+              <div></div>
+              <div></div> -->
               <input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span> 
               <input type="radio" name="level"  value="1" [(ngModel)]="level"><span>更新</span>
               <input type="radio" name="level"  value="0" [(ngModel)]="level"><span>新增</span>
               <input type="radio" name="level"  value="2" [(ngModel)]="level"><span>删除</span>
-              <!-- <mat-radio-group name='aaa' [(ngModel)]="level" style="position: relative;bottom: 3px;">
-                <mat-radio-button class='radio' style="margin-left: 3px;" value="" >全部</mat-radio-button>
-                <mat-radio-button style="margin-left: 20px;height: 10px;" value="1">更新</mat-radio-button>
-                <mat-radio-button style="margin-left: 20px;" value="0">新增</mat-radio-button>
-                <mat-radio-button style="margin-left: 20px;" value="2">删除</mat-radio-button>
-              </mat-radio-group> -->
               <div class="count">
                 <span >共计：{{count}}条</span>
               </div>
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
index ec5d4b5..a7b08bf 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
@@ -26,18 +26,26 @@
                     height: 10px;
                 }
                 span{
-                    font-size: 16px;
+                    @media screen and (min-device-width:1400px){
+                        font-size: 16px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        font-size: 14px;
+                    }
+                    
                     margin-left: 3px;
                 }
                 input{
-                    @media screen and (min-device-width:1300px){
+                    position: relative;
+                    @media screen and (min-device-width:1400px){
                         margin-left: 50px;
+                        top: 6px;
                     }
-                    @media screen and (max-device-width:1300px){
-                        margin-left: 12px;
+                    @media screen and (max-device-width:1400px){
+                        margin-left: 8px;
+                        top: 4px;
                     }
-                    position: relative;
-                    top: 6px;
+                    
                 }
                 .count{
                     @media screen and (min-device-width:1300px){
@@ -45,33 +53,47 @@
                     }
                     @media screen and (max-device-width:1300px){
                         margin-left: 20px;
+                        position: relative;
+                        bottom: 3px;
                     }
                 }
             }
             .headthree{
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     margin-left: 30px;
                 }
-                @media screen and (max-device-width:1300px){
+                @media screen and (max-device-width:1400px){
                     margin-left: 7px;
+                    font-size: 14px;
+                    mat-form-field{
+                        width: 120px;
+                    }
                 }
-                mat-form-field{
-                    width: 150px;
-                }
+                
                 button{
-                    width: 80px;
-                    height: 36px;
-                    font-size: 16px;
-                    @media screen and (min-device-width:1300px){
+                    
+                    @media screen and (min-device-width:1400px){
                         margin-left: 30px;
+                        font-size: 16px;
+                        width: 80px;
+                        height: 36px;
                     }
-                    @media screen and (max-device-width:1300px){
+                    @media screen and (max-device-width:1400px){
                         margin-left: 90px;
+                        font-size: 14px;
+                        
                     }
                 }
                 img{
-                    height: 14px;
-                    width: 14px;
+                    @media screen and (min-device-width:1400px){
+                        height: 14px;
+                        width: 14px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        height: 12px;
+                        width: 12px;
+                    }
+                    
                 }
                 
             }
@@ -80,7 +102,7 @@
             width: 100%;
             height: 100%;
             .tbodycss{
-                @media screen and (min-device-width:1300px){
+                @media screen and (min-device-width:1400px){
                     overflow-y: auto;
                 }
                 
@@ -91,7 +113,12 @@
                 }
                 td{
                     font-weight:10; 
-                    font-size:15px
+                    @media screen and (min-device-width:1400px){
+                        font-size: 16px;
+                    }
+                    @media screen and (max-device-width:1400px){
+                        font-size: 14px;
+                    }
                 }
             }
             table{
@@ -106,7 +133,12 @@
                     //font-size: 10px;
                     th{
                         font-weight:10; 
-                        font-size:16px
+                        @media screen and (min-device-width:1400px){
+                            font-size: 16px;
+                        }
+                        @media screen and (max-device-width:1400px){
+                            font-size: 14px;
+                        }
                     }
                 }
                 
@@ -118,16 +150,17 @@
     }
     .boxright{
         height: 100%;
-        @media screen and (max-device-width:1300px){
+        @media screen and (max-device-width:1400px){
             overflow-y: auto;
         }
-        width: 55%;
+        width: 53%;
         flex: 1;
         background-color: #FFFFFF;
         margin-left: 10px;
         display: flex;
         flex-direction: column;
         .company{
+            //margin-left: 20px;
             @media screen and (min-device-width:1400px){
                 overflow-y: auto;
             }
@@ -146,11 +179,11 @@
                 font-size: 16px;
             }
             .rightheadone{
-                width: 50%;
+                width: 40%;
                 margin-right: 7%;
             }
             .rightheadtwo{
-                width: 50%;
+                width: 60%;
                 margin-right: 2%;
             }
         }
@@ -184,7 +217,12 @@
 }
 th,td{
     height:48px;
-    font-size: 16px;
+    @media screen and (min-device-width:1400px){
+        font-size: 16px;
+    }
+    @media screen and (max-device-width:1400px){
+        font-size: 14px;
+    }
     text-align: center;
     //white-space: nowrap;
 }
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index 099f1fd..82735dc 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -9,15 +9,29 @@
                 <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
               </mat-form-field>
             </div>
-      
-            <div class="queryField ordiv">
+            <div class="queryField" >
+                <label style="margin-right: 10px;">单位类型:</label>
+                <mat-form-field>
+                    <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="unittype">
+                        <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
+                            {{unit.name}}
+                        </mat-option>
+                    </mat-select>
+                </mat-form-field>
+                <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+                <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+            </div>
+            <div class="queryField" *ngIf="!pcfind">
+                <button mat-raised-button color="primary">查询</button>
+                <button mat-raised-button style="margin-left: 25px;" type="button"  (click)="reset()">重置</button>
+              </div>
+            <div class="queryField ordiv" *ngIf="!padMore">
               <label style="margin-right: 10px;">消防救援站:</label>
               <mat-form-field class="example-full-width">
                 <input readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
               </mat-form-field>
               <mat-checkbox style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
-              <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-            <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+              
               <div class="organizationbox" *ngIf="isorganizationbox">
                   <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
                   <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@@ -40,17 +54,6 @@
                   </mat-tree>  
               </div>
           </div>
-      
-            <div class="queryField" *ngIf="!padMore">
-              <label style="margin-right: 10px;">单位类型:</label>
-              <mat-form-field>
-                  <mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="unittype">
-                      <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
-                          {{unit.name}}
-                      </mat-option>
-                  </mat-select>
-              </mat-form-field>
-          </div>
             <div class="queryField" *ngIf="!padMore">
               <label style="margin-right: 10px;">预案类型:</label>
               <mat-form-field>
@@ -61,8 +64,27 @@
                   <mat-option value=4>其他预案</mat-option>
                 </mat-select>
               </mat-form-field>
+              <span *ngIf="pcMore" style="margin-left: 15px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+              <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
             </div>
-            <div class="queryField" *ngIf="!padMore">
+            <div class="queryField" *ngIf="pcfind" >
+                <button mat-raised-button color="primary">查询</button>
+                <button mat-raised-button style="margin-left: 25px;" type="button"  (click)="reset()">重置</button>
+            </div>
+            <div class="queryField" *ngIf="!padMore&&!pcMore">
+                <label style="margin-right: 10px;">编制级别:</label>
+                <mat-form-field>
+                  <mat-select name="preparelevel" [(ngModel)]="preparelevel" placeholder='请选择编制级别'>
+                    <!-- <mat-option value="1">总队</mat-option>
+                    <mat-option value="2">支队</mat-option>
+                    <mat-option value="4">大队</mat-option>
+                    <mat-option value="8">中队</mat-option> -->
+                    <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
+                  </mat-select>
+                </mat-form-field>
+                <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
+              </div>
+            <div class="queryField" *ngIf="!padMore&&!pcMore">
               <label style="margin-right: 10px;">审核状态:</label>
               <mat-form-field>
                 <mat-select name="toExamine" [(ngModel)]="toExamine" placeholder='请选择审核状态'>
@@ -73,21 +95,9 @@
                 </mat-select>
               </mat-form-field>
             </div>
-            <div class="queryField" *ngIf="!padMore">
-              <label style="margin-right: 10px;">编制级别:</label>
-              <mat-form-field>
-                <mat-select name="preparelevel" [(ngModel)]="preparelevel" placeholder='请选择编制级别'>
-                  <!-- <mat-option value="1">总队</mat-option>
-                  <mat-option value="2">支队</mat-option>
-                  <mat-option value="4">大队</mat-option>
-                  <mat-option value="8">中队</mat-option> -->
-                  <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
-                </mat-select>
-              </mat-form-field>
-              <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
-            </div>
             
-              <div class="queryField" *ngIf="!padMore">
+            
+              <div class="queryField" *ngIf="!padMore&&!pcMore">
                   <label style="margin-right: 10px;">信息完整度排序:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
@@ -96,7 +106,7 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField" *ngIf="!padMore">
+              <div class="queryField" *ngIf="!padMore&&!pcMore">
                 <label style="margin-right: 10px;">制作情况:</label>
                 <mat-form-field>
                     <mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan">
@@ -106,10 +116,6 @@
                 </mat-form-field>
             </div>
           </div>
-          <div class="butclass" style="width: 100%;text-align: center;">
-              <button mat-raised-button color="primary" type="submit">查询</button>
-              <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
-          </div>
         </form>
     </div>
     <mat-divider></mat-divider>
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.scss b/src/app/plan-management/entry-plan/entry-plan.component.scss
index aca075b..0fda176 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.scss
+++ b/src/app/plan-management/entry-plan/entry-plan.component.scss
@@ -6,19 +6,24 @@
 //   border-bottom: 1px solid black;
   .queryBox {
     box-sizing: border-box;
-    padding: 5px 25px 0 25px;
+    padding: 5px 5px 0 10px;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
     align-items:center;
     // justify-content:center;
     .queryField {
-      margin: 0 40px;
+      margin: 0 10px;
       input {
         width: 180px;
         height: 22px;
         line-height: 22px;
         border-radius: 3px;}
+        @media screen and (max-device-width:1400px){
+            mat-form-field{
+                width: 160px;
+            }
+        }
     }
 
   } //queryBox
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 1e4032f..337e3bf 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.ts
+++ b/src/app/plan-management/entry-plan/entry-plan.component.ts
@@ -169,11 +169,18 @@ export class EntryPlanComponent implements OnInit {
     return style
   }
   level
+  
   ngOnInit(): void {
-    if(window.matchMedia("(max-width: 1300px)").matches){
+    if(window.matchMedia("(max-width: 1400px)").matches){
+      this.pcMore=false
       this.padMore=true
+      this.pcfind=false
+      this.padjt=true
     }else{
+      this.pcfind=true
+      this.pcMore=true
       this.padMore=false
+      this.padjt=false
     }
     this.getunitdata();
     this.getOrganizations();
@@ -207,16 +214,22 @@ export class EntryPlanComponent implements OnInit {
       ]
     }
   }
+  pcMore//pc更多
+  pcput=false//pc收起
+  pcfind//pc查询
+  padjt=false
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
+  pcInfo(){
+    this.pcMore=!this.pcMore
+    this.pcput=!this.pcput
+  }
   padInfo(){
     this.padMore=!this.padMore
     this.padput=!this.padput
   }
- 
-
 
   //得到当前单位信息
   getunitdata(){
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 2d846b6..f85889d 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -83,7 +83,7 @@ export class MeetPlanComponent implements OnInit {
   paginator: MatPaginator;
   length:any; //共多少条数据
   pageSize:any; //每页条数
-  pageSizeOptions: number[] = [13] //设置每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
   
   pcMore//pc更多
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
index 8d66c55..b4009eb 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
@@ -6,7 +6,7 @@
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 25px 0 15px;
+      padding: 5px 5px 0 15px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
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 f4755bb..ca16484 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
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-30 15:54:05
+ * @LastEditTime: 2021-03-31 14:12:46
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -112,7 +112,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
   paginator: MatPaginator;
   length:any; //共多少条数据
   pageSize:any; //每页条数
-  pageSizeOptions: number[] = [13] //设置每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
 
   //获取表格数据
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 f365153..41dd317 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -41,7 +41,7 @@ export class PassPlanComponent implements OnInit {
   paginator: MatPaginator;
   length:any; //共多少条数据
   pageSize:any; //每页条数
-  pageSizeOptions: number[] = [13] //设置每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
 
   displayedColumns: string[] = ['planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
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 1db23a1..cc5feb8 100644
--- a/src/app/plan-management/type-plan/type-plan.component.ts
+++ b/src/app/plan-management/type-plan/type-plan.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-06 09:47:43
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-30 16:36:01
+ * @LastEditTime: 2021-03-31 14:14:03
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -105,7 +105,7 @@ export class TypePlanComponent implements OnInit {
   paginator: MatPaginator;
   length:any; //共多少条数据
   pageSize:any; //每页条数
-  pageSizeOptions: number[] = [13] //设置每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
 
   //获取表格数据