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 984d467..eb3c1c2 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
@@ -8,27 +8,28 @@
                         <input  matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
                     </mat-form-field>
                 </div>
-    
                 <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>
+                    <label style="margin-right: 10px;">统一社会信用代码:</label>
+                    <mat-form-field class="example-full-width">
+                        <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
                     </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" *ngIf="!padMore">
-                    <label style="margin-right: 10px;">统一社会信用代码:</label>
-                    <mat-form-field class="example-full-width">
-                        <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
+                    <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>
+                    
                 </div>
                 <div class="queryField" *ngIf="!padMore">
                     <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 fbfb257..b76bbeb 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
@@ -14,16 +14,26 @@
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 3px 10px;
+        //margin: 3px 10px;
         
         input {
           //width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;}
-          @media screen and (max-device-width:1400px){
+          @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 150px;
+                width: 140px;
             }
         }
       }
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 871331e..9d22124 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.scss
+++ b/src/app/plan-audit/plan-record/plan-record.component.scss
@@ -16,9 +16,12 @@
                 @media screen and (min-device-width:1400px){
                     margin: 30px 0 0 28px;
                 }
-                @media screen and (max-device-width:1400px){
+                @media screen and (max-device-width:1200px){
                     margin-top: 10px;
                 }
+                @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                    margin: 20px 0 0 15px;
+                }
                 height: 40px;
                 display: flex;
                 flex-direction: row;
@@ -26,9 +29,12 @@
                     @media screen and (min-device-width:1400px){
                         font-size: 16px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         font-size: 13px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        font-size: 16px;
+                    }
                     margin-left: 3px;
                 }
                 input{
@@ -36,10 +42,14 @@
                         margin-left: 50px;
                         top: 6px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         margin-left: 12px;
                         top: 3px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        margin-left: 12px;
+                        top: 6px;
+                    }
                     position: relative;
                     
                 }
@@ -47,30 +57,37 @@
                     @media screen and (min-device-width:1400px){
                         margin-left: 110px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         margin-left: 20px;
                         position: relative;
                         bottom: 4px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        margin-left: 20px;
+                    }
                 }
             }
             .headdivtwo{
                 @media screen and (min-device-width:1400px){
                     margin: 0 0 0 28px;
                 }
-                @media screen and (max-device-width:1400px){
+                @media screen and (max-device-width:1200px){
                     margin-left: 0;
                 }
+                @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                    margin: 0 0 0 15px;
+                }
                 //height: 40px;
                 display: flex;
                 flex-direction: row;
                 span{
-                    @media screen and (min-device-width:1400px){
+                    @media screen and (min-device-width:1200px){
                         font-size: 16px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         font-size: 13px;
                     }
+                    
                     margin-left: 3px;
                 }
                 input{
@@ -78,10 +95,14 @@
                         margin-left: 50px;
                         top: 5px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         margin-left: 0;
                         top: 3px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        margin-left: 0;
+                        top: 5px;
+                    }
                     position: relative;
                     
                     
@@ -101,21 +122,32 @@
                 @media screen and (min-device-width:1400px){
                     margin-left: 30px;
                 }
-                @media screen and (max-device-width:1400px){
+                @media screen and (max-device-width:1200px){
                     font-size: 13px;
                     mat-form-field{
                         width: 120px;
                     }
                 }
-                
+                @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                    margin-left: 15px;
+                    mat-form-field{
+                        width: 120px;
+                    }
+                }
             }
             .headfour{
-                @media screen and (max-device-width:1400px){
+                @media screen and (max-device-width:1200px){
                     font-size: 13px;
                     mat-form-field{
                         width: 150px;
                     }
                 }
+                @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                    margin-left: 15px;
+                    mat-form-field{
+                        width: 150px;
+                    }
+                }
                 span{
                     @media screen and (min-device-width:1400px){
                         margin-left: 30px;
@@ -128,16 +160,23 @@
                         width: 80px;
                         height: 36px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
+                        margin-left: 80px;
+                    }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
                         margin-left: 80px;
                     }
                 }
                 img{
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        height: 14px;
+                        width: 14px;
+                    }
                     @media screen and (min-device-width:1400px){
                         height: 14px;
                         width: 14px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         height: 12px;
                         width: 12px;
                     }
@@ -174,12 +213,13 @@
                     //font-size: 16px;
                     th{
                         font-weight:10; 
-                        @media screen and (min-device-width:1400px){
+                        @media screen and (min-device-width:1200px){
                             font-size: 16px;
                         }
-                        @media screen and (max-device-width:1400px){
+                        @media screen and (max-device-width:1200px){
                             font-size: 13px;
                         }
+                        
                     }
                 }
                 
@@ -234,10 +274,10 @@
 }
 th,td{
     height:48px;
-    @media screen and (min-device-width:1400px){
+    @media screen and (min-device-width:1200px){
         font-size: 16px;
     }
-    @media screen and (max-device-width:1400px){
+    @media screen and (max-device-width:1200px){
         font-size: 13px;
     }
     text-align: center;
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 a7b08bf..21613c6 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
@@ -13,10 +13,13 @@
             display: flex;
             flex-direction: column;
             .headdiv{
-                @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) and (min-device-width:1200px){
+                    margin-left: 15px;
+                }
+                @media screen and (max-device-width:1200px){
                     margin-left: 5px;
                 }
                 height: 40px;
@@ -29,10 +32,12 @@
                     @media screen and (min-device-width:1400px){
                         font-size: 16px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        font-size: 16px;
+                    }
+                    @media screen and (max-device-width:1200px){
                         font-size: 14px;
                     }
-                    
                     margin-left: 3px;
                 }
                 input{
@@ -41,34 +46,50 @@
                         margin-left: 50px;
                         top: 6px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         margin-left: 8px;
                         top: 4px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        margin-left: 8px;
+                        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:1200px){
                         margin-left: 20px;
                         position: relative;
                         bottom: 3px;
                     }
+                    @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                        margin-left: 20px;
+                        /* position: relative;
+                        bottom: 3px; */
+                    }
                 }
             }
             .headthree{
                 @media screen and (min-device-width:1400px){
                     margin-left: 30px;
                 }
-                @media screen and (max-device-width:1400px){
+                @media screen and (max-device-width:1200px){
                     margin-left: 7px;
                     font-size: 14px;
                     mat-form-field{
                         width: 120px;
                     }
                 }
+                @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+                    margin-left: 15px;
+                    //font-size: 14px;
+                    mat-form-field{
+                        width: 140px;
+                    }
+                }
                 
                 button{
                     
@@ -113,10 +134,10 @@
                 }
                 td{
                     font-weight:10; 
-                    @media screen and (min-device-width:1400px){
+                    @media screen and (min-device-width:1200px){
                         font-size: 16px;
                     }
-                    @media screen and (max-device-width:1400px){
+                    @media screen and (max-device-width:1200px){
                         font-size: 14px;
                     }
                 }
@@ -133,10 +154,10 @@
                     //font-size: 10px;
                     th{
                         font-weight:10; 
-                        @media screen and (min-device-width:1400px){
+                        @media screen and (min-device-width:1200px){
                             font-size: 16px;
                         }
-                        @media screen and (max-device-width:1400px){
+                        @media screen and (max-device-width:1200px){
                             font-size: 14px;
                         }
                     }
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 0fda176..40b974d 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.scss
+++ b/src/app/plan-management/entry-plan/entry-plan.component.scss
@@ -6,20 +6,30 @@
 //   border-bottom: 1px solid black;
   .queryBox {
     box-sizing: border-box;
-    padding: 5px 5px 0 10px;
+    padding: 5px 0 0 10px;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
     align-items:center;
     // justify-content:center;
     .queryField {
-      margin: 0 10px;
+      //margin: 0 10px;
       input {
         width: 180px;
         height: 22px;
         line-height: 22px;
         border-radius: 3px;}
-        @media screen and (max-device-width:1400px){
+        @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
                 width: 160px;
             }
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.scss b/src/app/plan-management/maintain-up/maintain-up.component.scss
index fb5328a..1a477bb 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.scss
+++ b/src/app/plan-management/maintain-up/maintain-up.component.scss
@@ -16,15 +16,25 @@
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 3px 10px;
+       // margin: 3px 10px;
         input {
           width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;}
-          @media screen and (max-device-width:1400px){
+          @media screen and (min-device-width:1400px){
+            margin: 3px 10px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 15px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 130px;
+                width: 120px;
             }
         }
       }
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index 0d548f6..e9798c4 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -9,35 +9,36 @@
                 <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
-      
-      
-            <div class="queryField">
-              <label style="margin-right: 10px;">预案级别:</label>
+            <div class="queryField" >
+              <label style="margin-right: 10px;">编制级别:</label>
               <mat-form-field>
-                  <mat-select placeholder='请选择预案级别' name="level" [(ngModel)]="level">
-                    <mat-option value="6">国家级</mat-option>
-                    <mat-option value="7">市级</mat-option>
-                  </mat-select>
+                <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
+                  <!-- <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>
               <span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-            <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </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" *ngIf="!padMore">
-            <label style="margin-right: 10px;">编制级别:</label>
+            <label style="margin-right: 10px;">预案级别:</label>
             <mat-form-field>
-              <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
-                <!-- <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-select placeholder='请选择预案级别' name="level" [(ngModel)]="level">
+                  <mat-option value="6">国家级</mat-option>
+                  <mat-option value="7">市级</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">
             <label style="margin-right: 10px;">添加人:</label>
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss
index d1742a7..31ef63e 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.scss
+++ b/src/app/plan-management/meet-plan/meet-plan.component.scss
@@ -6,23 +6,33 @@
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 25px 0 15px;
+      padding: 5px 0 0 15px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 3px 10px;
+        
         input {
           width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;
         }
-        @media screen and (max-device-width:1400px){
+        @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 140px;
+                width: 120px;
             }
         }
       }
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
index dc73477..c9613fe 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
@@ -4,32 +4,58 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-30 15:54:25
+ * @LastEditTime: 2021-04-01 14:35:30
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
         <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
           <div class="queryBox">
-      
             <div class="queryField">
               <label style="margin-right: 10px;">预案名称:</label>
               <mat-form-field class="example-full-width">
                 <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
-          <div class="queryField">
+            <div class="queryField" >
+              <label style="margin-right: 10px;">编制级别:</label>
+              <mat-form-field>
+                <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
+                  <!-- <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>
+              <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" *ngIf="!padMore">
             <label style="margin-right: 10px;">添加人:</label>
             <mat-form-field class="example-full-width">
               <input matInput placeholder="请输入添加人" name="addname"  autocomplete="off" [(ngModel)]="addname">
             </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="!padMore">
+            <label style="margin-right: 10px;">预案类型:</label>
+            <mat-form-field>
+              <input matInput placeholder="请输入预案类型" name="reservePlanType"  autocomplete="off"  [(ngModel)]="typePlan">
+            </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="!pcfind">
+          
+          <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">
+          <div class="queryField" *ngIf="!padMore&&!pcMore">
             <label style="margin-right: 10px;">添加时间:</label>
             <mat-form-field class="example-full-width">
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
@@ -41,18 +67,7 @@
               <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
             </mat-form-field>
           </div>
-          <div class="queryField" *ngIf="!padMore">
-            <label style="margin-right: 10px;">预案类型:</label>
-            <mat-form-field>
-              <input matInput placeholder="请输入预案类型" name="reservePlanType"  autocomplete="off"  [(ngModel)]="typePlan">
-            </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="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>
@@ -64,19 +79,7 @@
                 </mat-select>
               </mat-form-field>
             </div>
-            <div class="queryField" *ngIf="!padMore&&!pcMore">
-              <label style="margin-right: 10px;">编制级别:</label>
-              <mat-form-field>
-                <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
-                  <!-- <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>
           
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 b4009eb..ae47af9 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,23 +6,33 @@
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 5px 0 15px;
+      padding: 5px 0 0 15px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 0 10px;
+        //margin: 0 10px;
         input {
           width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;
         }
-        @media screen and (max-device-width:1400px){
+        @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 160px;
+                width: 120px;
             }
         }
       }
diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html
index 9e06713..6dec103 100644
--- a/src/app/plan-management/open-plan/open-plan.component.html
+++ b/src/app/plan-management/open-plan/open-plan.component.html
@@ -8,33 +8,33 @@
             <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
           </mat-form-field>
         </div>
-
-  
-        <div class="queryField">
-          <label style="margin-right: 10px;">单位类型:</label>
+        <div class="queryField" >
+          <label style="margin-right: 10px;">编制级别:</label>
           <mat-form-field>
-              <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
-                  <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
-                      {{unit.name}}
-                  </mat-option>
-              </mat-select>
+            <mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'>
+              <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>
           <span *ngIf="padMore" style="margin-left: 20px; 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>
+        
       <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">
-        <label style="margin-right: 10px;">编制级别:</label>
+        <label style="margin-right: 10px;">单位类型:</label>
         <mat-form-field>
-          <mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'>
-            <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
-          </mat-select>
+            <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
+                <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
+                    {{unit.name}}
+                </mat-option>
+            </mat-select>
         </mat-form-field>
-        <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
-      </div>
+        
+    </div>
       <div class="queryField" *ngIf="!padMore">
         <label style="margin-right: 10px;">预案类型:</label>
         <mat-form-field>
diff --git a/src/app/plan-management/open-plan/open-plan.component.scss b/src/app/plan-management/open-plan/open-plan.component.scss
index 06ae319..7e795ed 100644
--- a/src/app/plan-management/open-plan/open-plan.component.scss
+++ b/src/app/plan-management/open-plan/open-plan.component.scss
@@ -1,28 +1,38 @@
 .header {
     width: 100%;
-    padding: 12px 10px;
+    padding: 12px 5px;
   //   margin-bottom: 10px;
     box-sizing: border-box;
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 15px;
+      padding: 5px 0 0 15px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 3px 10px;
+        //margin: 3px 10px;
         input {
           width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;
         }
-        @media screen and (max-device-width:1400px){
+        @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 140px;
+                width: 130px;
             }
         }
       }
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss
index 55d68b0..6b834aa 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.scss
+++ b/src/app/plan-management/pass-plan/pass-plan.component.scss
@@ -4,7 +4,7 @@
     box-sizing: border-box;
     .queryBox {
         box-sizing: border-box;
-        padding: 5px 5px 0 5px;
+        padding: 5px 0 0 5px;
         // margin-left: 50px;
         display: flex;
         flex-direction: row;
@@ -12,18 +12,28 @@
         align-items:center;
         // justify-content:center;
     .queryField {
-      margin: 0 10px;
+      //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: 110px;
+    @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
+            mat-form-field{
+                width: 120px;
+            }
         }
-    }
         
     }
     
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
index e2cd811..cf61363 100644
--- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
+++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
@@ -4,7 +4,7 @@
     box-sizing: border-box;
     .queryBox {
         box-sizing: border-box;
-        padding:5px 5px 0 5px;
+        padding:5px 0 0 5px;
         // margin-left: 50px;
         display: flex;
         flex-direction: row;
@@ -19,7 +19,14 @@
         line-height: 22px;
         border-radius: 3px;
     }
-    @media screen and (max-device-width:1400px){
+    @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+        //margin: 3px 10px;
+        mat-form-field{
+            width: 180px;
+        }
+    }
+    @media screen and (max-device-width:1200px){
+        //margin: 3px 0 3px 10px;
         mat-form-field{
             width: 110px;
         }
diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html
index 48e5edb..6863823 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -9,30 +9,32 @@
                 <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
-            
-          <div class="queryField">
-            <label style="margin-right: 10px;">添加人:</label>
-            <mat-form-field class="example-full-width">
-              <input matInput placeholder="请输入添加人" name="addname"  autocomplete="off" [(ngModel)]="addname">
-            </mat-form-field>
-            <span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+            <div class="queryField" >
+              <label style="margin-right: 10px;">编制级别:</label>
+              <mat-form-field>
+                <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
+                  <!-- <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>
+              <span *ngIf="padMore" style="margin-left: 20px; 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>
+          
           <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">
-            <label style="margin-right: 10px;">添加时间:</label>
+            <label style="margin-right: 10px;">添加人:</label>
             <mat-form-field class="example-full-width">
-              <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
-            </mat-form-field>
-            <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
-            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
-            <mat-form-field class="example-full-width" style="margin-left: 10px;">
-              <input type="date" matInput  autocomplete="off" name="endtime" [(ngModel)]="endtime">
+              <input matInput placeholder="请输入添加人" name="addname"  autocomplete="off" [(ngModel)]="addname">
             </mat-form-field>
+            
           </div>
           
             <div class="queryField" *ngIf="!padMore">
@@ -52,19 +54,19 @@
               <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"  placeholder='请选择编制级别' [(ngModel)]="projectlevel">
-                  <!-- <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 class="example-full-width">
+              <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
+            </mat-form-field>
+            <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
+            <mat-form-field class="example-full-width" style="margin-left: 10px;">
+              <input type="date" matInput  autocomplete="off" name="endtime" [(ngModel)]="endtime">
+            </mat-form-field>
+          </div>
+          
             
           </div>
         </form>
diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss
index 22fe107..5f3d4fc 100644
--- a/src/app/plan-management/type-plan/type-plan.component.scss
+++ b/src/app/plan-management/type-plan/type-plan.component.scss
@@ -6,23 +6,33 @@
   //   border-bottom: 1px solid black;
     .queryBox {
       box-sizing: border-box;
-      padding: 5px 25px 0 15px;
+      padding: 5px 0 0 15px;
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items:center;
       // justify-content:center;
       .queryField {
-        margin: 3px 10px;
+       // margin: 3px 10px;
         input {
           width: 180px;
           height: 22px;
           line-height: 22px;
           border-radius: 3px;
         }
-        @media screen and (max-device-width:1400px){
+        @media screen and (min-device-width:1400px){
+            margin: 3px 20px;
+        }
+        @media screen and (max-device-width:1400px)and (min-device-width:1200px){
+            margin: 3px 10px;
+            mat-form-field{
+                width: 180px;
+            }
+        }
+        @media screen and (max-device-width:1200px){
+            margin: 3px 0 3px 10px;
             mat-form-field{
-                width: 150px;
+                width: 120px;
             }
         }
       }
diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts
index cd98dbf..4d126bf 100644
--- a/src/app/statistic-analysis/echarts-data.service.ts
+++ b/src/app/statistic-analysis/echarts-data.service.ts
@@ -439,7 +439,7 @@ export class EchartsDataService {
        this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
       }
       this.res+='</tbody>'
-      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
+      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
     
@@ -479,7 +479,7 @@ export class EchartsDataService {
       }
       
       this.res+='</tbody>'
-      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
+      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
   }
@@ -487,66 +487,17 @@ export class EchartsDataService {
   apidata=[]
   biaogeTishiyuan(datas){
     //localStorage.setItem('tishi',this.tishiData)
-    console.log(datas)
-    let paramdata={
-      planStatus:datas.type
-    }
-    if(datas.name=='预案新增'){
-      this.localData=''
-      if(localStorage.getItem('addtishi')==undefined){
-        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
-          this.tishiData=data.organizations
-          localStorage.setItem('addtishi',JSON.stringify(this.tishiData))
-        })
-      }
-      this.localData=localStorage.getItem('addtishi')
-    }else if(datas.name=='预案审核中'){
-      this.localData=''
-      if(localStorage.getItem('shenheingtishi')==undefined){
-        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
-          this.tishiData=data.organizations
-          localStorage.setItem('shenheingtishi',JSON.stringify(this.tishiData))
-        })
-      }
-      this.localData=localStorage.getItem('shenheingtishi')
-    }else if(datas.name=='预案审核退回'){
-      this.localData=''
-      if(localStorage.getItem('shenhetuitishi')==undefined){
-        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
-          this.tishiData=data.organizations
-          localStorage.setItem('shenhetuitishi',JSON.stringify(this.tishiData))
-        })
-      }
-      this.localData=localStorage.getItem('shenhetuitishi')
-    }else if(datas.name='预案审核通过'){
-      this.localData=''
-      if(localStorage.getItem('yuansuccesstishi')==undefined){
-        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
-          this.tishiData=data.organizations
-          localStorage.setItem('yuansuccesstishi',JSON.stringify(this.tishiData))
-        })
-      }
-      this.localData=localStorage.getItem('yuansuccesstishi')
-    }else if(datas.name='预案编制'){
-      this.localData=''
-      if(localStorage.getItem('yuanbiantishi')==undefined){
-        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
-          this.tishiData=data.organizations
-          localStorage.setItem('yuanbiantishi',JSON.stringify(this.tishiData))
-        })
+    this.tishiData=''
+    for(var a in this.obdata[0].plansStatuses){
+      if(this.obdata[0].plansStatuses[a].planStatusName==datas.planStatusName){
+        this.tishiData=this.obdata[0].plansStatuses[a].organizations
       }
-      this.localData=localStorage.getItem('yuanbiantishi')
     }
-    
-    
-    console.log(JSON.parse(this.localData) )
-    this.localData=JSON.parse(this.localData)
-      window.setTimeout(()=>{
-      var countall=0//总计
-      var countbi=0//站比
-      var allCountbi=0//总站比
-      for(var i=0;i<this.localData.length;i++){
-        countall+=this.localData[i].count
+    var countall=0//总计
+    var countbi=0//站比
+    var allCountbi=0//总站比
+      for(var i=0;i<this.tishiData.length;i++){
+        countall+=this.tishiData[i].count
       }
       this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
       this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px;  color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
@@ -556,20 +507,19 @@ export class EchartsDataService {
       this.res+='<td style="text-align:center;width:30%;">总占比</td>'
       this.res+='</tr></thead>'
       this.res+='<tbody>';
-      for(var i=0;i<this.localData.length;i++){
-        countbi=Math.round(this.localData[i].count/countall* 10000)/ 100.00
+      for(var i=0;i<this.tishiData.length;i++){
+        countbi=Math.round(this.tishiData[i].count/countall* 10000)/ 100.00
         allCountbi=allCountbi+countbi
        this.res+='<tr>'
-       this.res+='<td style="text-align:center;">'+this.localData[i].organizationName+'</td>'
-       this.res+='<td style="text-align:center;">'+this.localData[i].count+'</td>'
+       this.res+='<td style="text-align:center;">'+this.tishiData[i].organizationName+'</td>'
+       this.res+='<td style="text-align:center;">'+this.tishiData[i].count+'</td>'
        this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
       }
+      
       this.res+='</tbody>'
-      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
+      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
-    })
-    
   }
 
 
diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts
index c8788bb..ae140a3 100644
--- a/src/app/statistic-analysis/state/page-one/page-one.component.ts
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-01 15:24:39
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-04-01 09:46:00
+ * @LastEditTime: 2021-04-01 14:22:36
  */
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
@@ -109,11 +109,11 @@ export class PageOneComponent implements OnInit {
                 
               },
               data: [
-                  {value: this.tabledata[0].planningStatistics.newCount, name: '预案新增',type:1},
-                  {value: this.tabledata[0].planningStatistics.approvedCount, name: '预案审核通过',itemStyle:{color:'#02A7F0'},type:3},
-                  {value: this.tabledata[0].planningStatistics.editingCount, name: '预案编制',type:5},
-                  {value: this.tabledata[0].planningStatistics.rejectedCount, name: '预案审核退回',type:4},
-                  {value: this.tabledata[0].planningStatistics.auditingCount, name: '预案审核中',type:2}
+                  {value: this.tabledata[0].plansStatuses[0].count, name: '预案新增',type:1,planStatusName:this.tabledata[0].plansStatuses[0].planStatusName},
+                  {value: this.tabledata[0].plansStatuses[2].count, name: '预案审核通过',itemStyle:{color:'#02A7F0'},type:3,planStatusName:this.tabledata[0].plansStatuses[2].planStatusName},
+                  {value: this.tabledata[0].plansStatuses[4].count, name: '预案编制',type:5,planStatusName:this.tabledata[0].plansStatuses[4].planStatusName},
+                  {value: this.tabledata[0].plansStatuses[3].count, name: '预案审核退回',type:4,planStatusName:this.tabledata[0].plansStatuses[3].planStatusName},
+                  {value: this.tabledata[0].plansStatuses[1].count, name: '预案审核中',type:2,planStatusName:this.tabledata[0].plansStatuses[1].planStatusName}
               ],
               emphasis: {
                   itemStyle: {
@@ -126,19 +126,22 @@ export class PageOneComponent implements OnInit {
       ]
     };
     this.indexBzt.on('click', (params) => {
-      /* let jwt = sessionStorage.getItem("token");
-      let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]);
-      let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt);
-      let identityJsonparse=JSON.parse(identityJson) */
-      if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.echartsData.localData.length>0){
-        window.setTimeout(()=>{
-          this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':params.name,'type':params.data.type}});
-        })
-      }
-      else if(this.echartsData.level=='3'){
-        //中队跳转
-        this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'id':null,'type':params.data.type}});
+      console.log(params)
+      for(var i=0;i<this.tabledata[0].plansStatuses.length;i++){
+        if(this.tabledata[0].plansStatuses[i].planStatusName==params.data.planStatusName){
+          if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.tabledata[0].plansStatuses[i].organizations.length>0){
+            window.setTimeout(()=>{
+              this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':params.name,'type':params.data.type}});
+            })
+          }
+          else if(this.echartsData.level=='3'){
+            //中队跳转
+            this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'id':null,'type':params.data.type}});
+          }
+        }
       }
+      
+      
     });
     this.indexBzt.setOption(options);
   }
diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.html b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.html
index 465c667..1e9d89d 100644
--- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.html
+++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-05 08:59:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-17 08:49:56
+ * @LastEditTime: 2021-04-01 15:54:10
 -->
 <div class="content">