diff --git a/debug.log b/debug.log
index 5f9ed26..c4638ef 100644
--- a/debug.log
+++ b/debug.log
@@ -1,2 +1,3 @@
 [1229/141605.754:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0104/100053.968:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0122/085819.900:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 3b57938..16298ba 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -586,6 +586,14 @@ export class DisposalNodeData {
    * 鐗堟湰鍙�
    */
   public Version: string;
+  /**
+   * 鍥剧墖鍦板潃
+   */
+  public BackgroundImageUrl: string;
+    /**
+   * 鍥剧墖鍦板潃
+   */
+  public BackgroundImageAngle: number;
   /**
    * 澶勭疆鑺傜偣缂栧彿
    */
diff --git a/src/app/data-collection/data-collection.module.ts b/src/app/data-collection/data-collection.module.ts
index e901e7e..ad38bdf 100644
--- a/src/app/data-collection/data-collection.module.ts
+++ b/src/app/data-collection/data-collection.module.ts
@@ -44,12 +44,12 @@ import {MatTreeModule} from '@angular/material/tree';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { DataCollectionRoutingModule } from './data-collection.routing';
 import { AddWater, WaterCollectionComponent } from './water-collection/water-collection.component';
-import { AddFireForce, FireForceComponent } from './fire-force/fire-force.component';
+import { AddFireForce, FireForceComponent, ViewDetails } from './fire-force/fire-force.component';
 import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component';
 import { NzTreeModule } from 'ng-zorro-antd/tree';
 
 @NgModule({
-  declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce],
+  declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce,ViewDetails],
   imports: [
     CommonModule,
     A11yModule,
diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html
index bebd0d4..94191c0 100644
--- a/src/app/data-collection/fire-force/fire-force.component.html
+++ b/src/app/data-collection/fire-force/fire-force.component.html
@@ -108,7 +108,16 @@
         <div class="detailsbox" *ngIf="selectedFireForceLevel != null">
             <div class="masklayer" *ngIf="isMasklayer">
                 <mat-spinner [diameter]='30'></mat-spinner>
-                <span>涓婁紶涓�...</span>
+                <span>璇风瓑寰�...</span>
+            </div>
+            <div class="masklayer" *ngIf="isMasklayerUploading">
+                <mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
+                <span>涓婁紶涓�...({{progressBarValue}}%)</span>
+                <button (click)="cancelUploading()" class="cancelbtn" mat-flat-button>鍙栨秷涓婁紶</button>
+            </div>
+            <div class="masklayer" *ngIf="isMasklayerDownload">
+                <mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
+                <span>涓嬭浇涓�...({{progressBarValue}}%)</span>
             </div>
             <div class="tabsbox">
                 <div class="tabs">
@@ -450,8 +459,8 @@
                             <span>
                                 绠¤緰鍗曚綅:
                             </span>
-                            <input disabled [(ngModel)]="selectedFireForce.name" class="smallwidth" type="text" placeholder="鍚嶇О">
-                            <input disabled [(ngModel)]="selectedFireForce.code" class="smallwidth" type="text" placeholder="缂栧彿">
+                            <input disabled [(ngModel)]="superior.name" class="smallwidth" type="text" placeholder="鍚嶇О">
+                            <input disabled [(ngModel)]="superior.code" class="smallwidth" type="text" placeholder="缂栧彿">
                         </mat-grid-tile>
                         <mat-grid-tile colspan='3' rowspan='1'>
                             <span>
@@ -537,9 +546,6 @@
                         </mat-grid-tile>
                     </mat-grid-list>
                 </div>
-                <div style="width: 100%;height: 22px;">
-
-                </div>
             </div>
             <!-- 杞﹁締 -->
             <!-- <div class="contant" *ngIf="tabIndex == 2">
@@ -551,7 +557,8 @@
                     <mat-icon class="deleteFile" (click)="deleteFile(item,$event)">highlight_off</mat-icon>
                     <div class="imgbox">
                         <img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'png'
-                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'" 
+                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'
+                        || item.fileName.split('.')[item.fileName.split('.').length-1] == 'JPG'" 
                         class="thumbnailImg" src="/api/Objects/PlanPlatform/{{item.objectName}}" alt="">
                         <img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'docx'
                         || item.fileName.split('.')[item.fileName.split('.').length-1] == 'doc'" 
@@ -565,7 +572,7 @@
                     </div>
                     <span [title]="item.fileName">{{item.fileName}}</span>
                     <button (click)="clickFile(item)" class="btn btn1" mat-flat-button color="primary">鏌ョ湅</button>
-                    <button class="btn btn2" mat-flat-button color="primary">涓嬭浇</button>
+                    <button (click)="download (item)" class="btn btn2" mat-flat-button color="primary">涓嬭浇</button>
                 </div>
             </div>
         </div>
diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss
index e56576d..42dbcf1 100644
--- a/src/app/data-collection/fire-force/fire-force.component.scss
+++ b/src/app/data-collection/fire-force/fire-force.component.scss
@@ -356,7 +356,7 @@
         }
         .contant{
             width: 100%;
-            height:480px;
+            height:460px;
             overflow-y: auto;
             p{
                 color: #2196F3;
@@ -443,6 +443,7 @@
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     color:  gray;
+                    font-size: 14px;
                 }
                 .deleteFile{
                     position: absolute;
@@ -461,10 +462,10 @@
                     display: none;
                 }
                 .btn1{
-                    top: 35px;
+                    top: 37px;
                 }
                 .btn2{
-                    top: 75px;
+                    top: 78px;
                 }
             }
             .fileDivBox:hover{
@@ -497,6 +498,15 @@
                 font-size: 14px;
                 margin-top: 5px;
             }
+            .progressbar{
+                width: 15%;
+            }
+            .cancelbtn{
+                height: 32px;
+                line-height: 32px;
+                font-size: 14px;
+                margin-top: 12px;
+            }
         }
     }
 }
diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts
index ea547cf..5784fa2 100644
--- a/src/app/data-collection/fire-force/fire-force.component.ts
+++ b/src/app/data-collection/fire-force/fire-force.component.ts
@@ -19,7 +19,7 @@ declare var AMap: any;
 export class FireForceComponent implements OnInit {
 
   constructor(private tree: TreeService,public snackBar: MatSnackBar,private http:HttpClient,private  elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { }
-  isMasklayer:boolean = false//閬僵灞傛槸鍚︽墦寮�
+  
   isCheckedOfSearchDiv:boolean = true//鍒楄〃杩囨护婊戝潡
   slideChange(e){
     this.isCheckedOfSearchDiv = e.checked
@@ -146,7 +146,6 @@ export class FireForceComponent implements OnInit {
     this.isGisTopBox = false
     if(this.selectedFireForceId != node.id){
       this.clearData()
-     
       this.selectedFireForce = node
       this.selectedFireForceId = node.id
       if(node.forceType != 0){//濡傛灉鏄叾浠栨秷闃插姏閲�
@@ -158,6 +157,7 @@ export class FireForceComponent implements OnInit {
       if(this.newPositionMarker){
         this.map.remove(this.newPositionMarker);
       }
+
       if(node.fireForceDetailId){
         this.isPost = false//鏄惁璧皃ost鍒涘缓鎺ュ彛
         let type
@@ -166,7 +166,9 @@ export class FireForceComponent implements OnInit {
         }else{
           type = 1
         }
+        this.isMasklayer = true
         this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => {
+          this.isMasklayer = false
           this.FireForceDetailInfo = data
           if(data.location && data.location.x){//濡傛灉宸茬粡鏍囨敞鍗曚綅鍧愭爣
             console.log('寮�濮嬫爣娉�')
@@ -207,6 +209,14 @@ export class FireForceComponent implements OnInit {
         
         this.map.setCity('涓婃捣甯�');
       }
+
+      //瀵绘壘绠¤緰鍗曚綅
+      this.allFireForceList.forEach(item => {
+        if(item.id == node.parentId){
+          this.superior.name = item.name
+          this.superior.code = item.code
+        }
+      })
     }
   }
   //鎼滅储
@@ -270,7 +280,7 @@ export class FireForceComponent implements OnInit {
     let isDelete = window.confirm(`纭畾瑕佸垹闄�${item.name}鍚梎)
     if(isDelete){
       this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => {
-        const config = new MatSnackBarConfig();
+        let config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open('鍒犻櫎鎴愬姛','纭畾',config);
@@ -363,10 +373,6 @@ export class FireForceComponent implements OnInit {
   clearData(){
     this.deletedFile = []//娓呯┖鐩稿叧璧勬枡宸插垹闄ょ紦瀛�
     this.AttachmentArr = []//娓呯┖鐩稿叧璧勬枡
-    this.superior = {
-      name:'',
-      code:''
-    }
     this.positionLngLat = {x:'',y:''}
     this.FireForceDetailInfo = {
       // id:'',//缂栧彿
@@ -707,14 +713,19 @@ export class FireForceComponent implements OnInit {
   AttachmentArr:any = []//涓婁紶闄勪欢鍦板潃闆嗗悎
   uploadId:any//鍒嗗潡涓婁紶id
   objectName:any
+  progressBarValue:any = 0//鍒嗗潡涓婁紶杩涘害
+  isMasklayer:boolean = false//鍦嗗湀閬僵灞傛槸鍚︽墦寮�
+  isMasklayerUploading:boolean = false//涓婁紶杩涘害鏉￠伄缃╁眰鏄惁鎵撳紑
+  isMasklayerDownload:boolean = false//涓嬭浇杩涘害鏉￠伄缃╁眰鏄惁鎵撳紑
   uploadAttachment(e){
     console.log('閫夋嫨鐨勬枃浠�',e)
     this.file = e.target.files[0] || null //涓婁紶鐨勬枃浠�
     let file = e.target.files[0] || null //鑾峰彇涓婁紶鐨勬枃浠�
     let fileSize = file.size || null //涓婁紶鏂囦欢鐨勬�诲ぇ灏�
     let shardSize = 5 * 1024 * 1024 //5MB涓�涓垎鐗�
-    this.isMasklayer = true
+    
     if (file && fileSize<=shardSize) { //涓婁紶鏂囦欢<=5MB鏃�
+      this.isMasklayer = true
       console.log('file',this.file)
       let formData = new FormData()
       formData.append("file",file)
@@ -729,8 +740,13 @@ export class FireForceComponent implements OnInit {
         this.AttachmentArr.push(obj)
         this.isMasklayer = false
         console.log('涓婁紶鎴愬姛',data)
+        let config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('涓婁紶鎴愬姛','纭畾',config);
       })
     } else if (file && fileSize>shardSize) { //涓婁紶鏂囦欢>5MB鏃�,鍒嗗潡涓婁紶
+      this.isMasklayerUploading = true
       let data = {filename: file.name}
       this.http.post(`/api/NewMultipartUpload/PlanPlatform/FireForce/${this.selectedFireForce.id}`,{},{params:data}).subscribe((data:any)=>{ //鍒濆鍖栧垎娈典笂浼�
         console.log('鍒濆鍖栧垎鍧椾笂浼犳垚鍔�',data)
@@ -741,14 +757,13 @@ export class FireForceComponent implements OnInit {
     }
   }
   PartNumberETag:any=[]; //姣忔杩斿洖闇�瑕佷繚瀛樼殑淇℃伅
+
   //寮�濮嬪垎娈典笂浼�
   async subsectionUploading () {
-    
     let file = this.file || null //鑾峰彇涓婁紶鐨勬枃浠�
     let fileSize = file.size || null //涓婁紶鏂囦欢鐨勬�诲ぇ灏�
     let shardSize = 5 * 1024 * 1024 //5MB涓�涓垎鐗�
     let allSlice = Math.ceil(fileSize / shardSize) //鎬绘枃浠�/5MB===鍏卞垎澶氬皯娈�
-
     for (let i = 0;i < allSlice;i++) { //寰幆鍒嗘涓婁紶
         let start = i * shardSize //鍒囧壊鏂囦欢寮�濮嬩綅缃�
         let end = Math.min(fileSize, start + shardSize); //鍒囧壊鏂囦欢缁撴潫浣嶇疆
@@ -766,9 +781,10 @@ export class FireForceComponent implements OnInit {
           })
         });
         this.PartNumberETag.push(result)
-        // this.uploadProgress = Number((i/allSlice).toFixed(2))*100
+        // this.progressBarValue = Number((i/allSlice).toFixed(2))*100
+        this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
         if (this.PartNumberETag.length === allSlice) {
-          // this.uploadProgress = 100
+          this.progressBarValue = 100
           this.endUploading()}
     }//for寰幆
 
@@ -786,11 +802,90 @@ export class FireForceComponent implements OnInit {
         fileLength:this.file.size
       }
       this.AttachmentArr.push(obj)
-      console.log('瀹屾垚鍒嗗潡涓婁紶',data)
-      this.isMasklayer = false
+      this.isMasklayerUploading = false//鍏抽棴杩涘害鏉￠伄缃╁眰
+      this.progressBarValue = 0//閲嶇疆杩涘害鏁�
+      let config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('涓婁紶鎴愬姛','纭畾',config);
     })
   }
 
+  //鍙栨秷鍒嗗潡涓婁紶
+  cancelUploading() {
+    this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{
+      this.progressBarValue = 0;
+      this.isMasklayerUploading= false
+      this.PartNumberETag =[] //娓呯┖淇濆瓨杩斿洖鐨勪俊鎭�
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('鍙栨秷涓婁紶鎴愬姛','纭畾',config);
+    })
+  }
+
+  //涓嬭浇
+  download (e) {
+    this.isMasklayerDownload = true //寮�鍚笅杞借繘搴︽潯
+    let file = e //浼犻�掕繃鏉ョ殑鏂囦欢鍏冩暟鎹�
+    let fileSize = file.fileLength //涓嬭浇鏂囦欢鐨勬�诲ぇ灏�
+    let shardSize = 3 * 1024 * 1024 //鏂囦欢澶у皬鏄惁澶т簬10MB
+    if (file && fileSize<=shardSize) { //<=3MB鏃剁洿鎺ヤ笅杞�
+      this.progressBarValue = 60
+      this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{responseType: 'blob'},).subscribe(data=>{
+        let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL鍒涘缓涓�涓笅杞紹lob鐨剈rl鍦板潃
+        let link = document.createElement("a");
+        link.style.display = "none";
+        link.href = url;
+        let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        this.isMasklayerDownload = false //鍏抽棴涓嬭浇杩涘害鏉�
+        this.progressBarValue = 0 //鍒濆鍖栬繘搴︽潯
+      })
+    } else if (file && fileSize>shardSize) { //>3MB鏃跺垎鍧椾笅杞�
+      this.blockingDownload(e) //鍒嗘涓嬭浇
+    }
+
+  }
+
+  //鍒嗘涓嬭浇骞跺悎骞�
+  async blockingDownload (e) {
+    let file = e //浼犻�掕繃鏉ョ殑鏂囦欢鍏冩暟鎹�
+    let fileSize = file.fileLength //涓嬭浇鏂囦欢鐨勬�诲ぇ灏�
+    let shardSize = 3 * 1024 * 1024 //3MB涓�涓垎鐗�
+    let allSlice = Math.ceil(fileSize / shardSize) //鎬绘枃浠�/3MB===鍏卞垎澶氬皯娈�
+    let allFile:any = [] //鎵�鏈夌殑file鍒嗘
+
+    for (let i=0;i<allSlice;i++) {
+      let start = i * shardSize //姣忔涓嬭浇鏂囦欢寮�濮嬩綅缃�
+      let end = Math.min(fileSize, start + shardSize-1); //姣忔涓嬭浇鏂囦欢缁撴潫涓烘
+
+      let result =  await new Promise ((result,reject)=>{
+        this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{
+          result(data) }) 
+      })
+      allFile.push(result)
+      // this.progressBarValue = Number((i/allSlice).toFixed(2))*100 //鏂囦欢杩涘害鏁�
+      this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
+      if (allFile.length === allSlice) { //鍚堝苟鏂囦欢杈撳嚭缁欐祻瑙堝櫒
+        let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL鍒涘缓涓�涓笅杞紹lob鐨剈rl鍦板潃
+        let link = document.createElement("a");
+        link.style.display = "none";
+        link.href = url;
+        let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        this.isMasklayerDownload = false //鍏抽棴涓嬭浇杩涘害鏉�
+        this.progressBarValue = 0 //鍒濆鍖栬繘搴︽潯
+      }
+
+    } //for寰幆缁撴潫
+
+  }
+
   //鍒犻櫎鍥剧墖
   deletedFile:any = []
   deleteFile(item,e){
@@ -817,7 +912,7 @@ export class FireForceComponent implements OnInit {
   clickFile(item){
     console.log(item)
     let suffix = item.fileName.split('.')[item.fileName.split('.').length-1]
-    if(suffix == 'png' || suffix == 'jpg'){
+    if(suffix == 'png' || suffix == 'jpg' || suffix == 'JPG'){
       console.log('杩欐槸鍥剧墖')
       let dom =  document.getElementById(`viewerjs`)
       let pObjs = dom.childNodes;
@@ -842,6 +937,13 @@ export class FireForceComponent implements OnInit {
       config.duration = 3000
       this.snackBar.open('鏆備笉鏀寔鏌ョ湅','纭畾',config);
     }
+    if(suffix == 'mp4'){
+      const dialogRef = this.dialog.open(ViewDetails, {//璋冪敤open鏂规硶鎵撳紑瀵硅瘽妗嗗苟涓旀惡甯﹀弬鏁拌繃鍘�
+        data: {item:item,type:"video"},
+        id:'videodialog'
+      });
+      dialogRef.afterClosed().subscribe();
+    }
   }
 }
 
@@ -876,4 +978,28 @@ export class AddFireForce {
     this.dialogRef.close(this.selectedFireForceTypeIndex)
   }
 
-}
\ No newline at end of file
+}
+
+//鏌ョ湅鍥剧墖澶у浘鍜岃棰�
+@Component({
+  selector: 'viewdetails',
+  templateUrl: './viewdetails.html',
+  styleUrls: ['./fire-force.component.scss']
+})
+export class ViewDetails {
+  // myControl = new FormControl();
+  //娉ㄥ叆MatDialogRef锛屽彲浠ョ敤鏉ュ叧闂璇濇
+  //瑕佽闂璇濇缁勪欢涓殑鏁版嵁锛屽繀椤讳娇鐢∕AT_DIALOG_DATA娉ㄥ叆浠ょ墝
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<ViewDetails>,@Inject(MAT_DIALOG_DATA) public data) {}
+  Url:string
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+  ngOnInit(): void {
+   this.Url = '/api/Objects/PlanPlatform/' + this.data.item.objectName
+  }
+  closeDialog(){
+    this.dialogRef.close();
+  }
+
+}
diff --git a/src/app/data-collection/fire-force/viewdetails.html b/src/app/data-collection/fire-force/viewdetails.html
new file mode 100644
index 0000000..7f1b9b4
--- /dev/null
+++ b/src/app/data-collection/fire-force/viewdetails.html
@@ -0,0 +1 @@
+<video autoplay controls *ngIf="data.type == 'video'" [src]="Url"></video>
diff --git a/src/app/interface.ts b/src/app/interface.ts
index df5d7b2..dd3ef79 100644
--- a/src/app/interface.ts
+++ b/src/app/interface.ts
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 16:44:22
+ */
 export interface Data {
     token:string,
     refreshToken:string,
@@ -30,12 +38,36 @@ export enum AuditStatusEnum {
     "zero",
     "瀹℃牳涓�",
     "瀹℃牳閫氳繃",
-    "",
-    "瀹℃牳閫�鍥�",
+    "two",
+    "缁堝閫�鍥�",
     "five",
     "six",
     "seven",
-    "鏈彁浜ゅ鏍�"
+    "鏈彁浜ゅ鏍�",
+    "nine",
+    "ten",
+    "eleven",
+    "twelve",
+    "thieteen",
+    "fourteen",
+    "fifteen",
+    "寰呯粓瀹�",
+    "shiqi",
+    "shiba",
+    "shijiu",
+    "ershi",
+    "ershiyi",
+    "ershier",
+    "ershis",
+    "t1",
+    "t2",
+    "t3",
+    "t4",
+    "t5",
+    "t6",
+    "t7",
+    "t8",
+    "鍒濆閫�鍥�",
 }
 
 export enum PlanLevelEnum {
diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.html b/src/app/key-unit/basicinfo-look/basicinfo.component.html
index 7ed3469..2cd6ccb 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.html
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.html
@@ -167,14 +167,14 @@
                                         <span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>锛�</span>
                                         
                                         <!-- 濡傛灉绫诲瀷鏄枃鏈� --> 
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input  readonly matInput  name="{{i.propertyName}}{{www}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 濡傛灉绫诲瀷鏄暟瀛� -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input  readonly matInput  name="{{i.propertyName}}{{www}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -182,9 +182,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                         <!-- 濡傛灉绫诲瀷鏄�愮伀绛夌骇 -->
+                                         <mat-form-field *ngIf="i.propertyName == '鑰愮伀绛夌骇'">
+                                            <mat-select readonly name="{{i.propertyName}}{{www}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="璇烽�夋嫨鑰愮伀绛夌骇" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1绾�</mat-option>
+                                                <mat-option value="1">2绾�</mat-option>
+                                                <mat-option value="2">3绾�</mat-option>
+                                                <mat-option value="3">鍏朵粬</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 濡傛灉绫诲瀷鏄琛屾枃鏈� -->
-                                        <textarea readonly  *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
+                                        <textarea readonly  *ngIf="i.propertyType == 1 && i.propertyName != '鑰愮伀绛夌骇'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
     
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="position: absolute;
@@ -249,14 +257,14 @@
 
                                         
                                          <!-- 濡傛灉绫诲瀷鏄枃鏈� -->
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input readonly  matInput  name="{{i.propertyName}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 濡傛灉绫诲瀷鏄暟瀛� -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input readonly  matInput  name="{{i.propertyName}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -264,9 +272,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                         <!-- 濡傛灉绫诲瀷鏄�愮伀绛夌骇 -->
+                                         <mat-form-field *ngIf="i.propertyName == '鑰愮伀绛夌骇'">
+                                            <mat-select readonly name="{{i.propertyName}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="璇烽�夋嫨鑰愮伀绛夌骇" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1绾�</mat-option>
+                                                <mat-option value="1">2绾�</mat-option>
+                                                <mat-option value="2">3绾�</mat-option>
+                                                <mat-option value="3">鍏朵粬</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 濡傛灉绫诲瀷鏄琛屾枃鏈� -->
-                                        <textarea readonly  *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
+                                        <textarea readonly  *ngIf="i.propertyType == 1 && i.propertyName != '鑰愮伀绛夌骇'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="    position: absolute;
                                         left: 205px;
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html
index 5e9f5f9..57c48e2 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.html
+++ b/src/app/key-unit/basicinfo/basicinfo.component.html
@@ -196,14 +196,14 @@
                                         <span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>锛�</span>
                                         
                                         <!-- 濡傛灉绫诲瀷鏄枃鏈� --> 
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input matInput  name="{{i.propertyName}}{{www}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 濡傛灉绫诲瀷鏄暟瀛� -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input matInput  name="{{i.propertyName}}{{www}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -211,16 +211,24 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                        <!-- 濡傛灉绫诲瀷鏄�愮伀绛夌骇 -->
+                                        <mat-form-field *ngIf="i.propertyName == '鑰愮伀绛夌骇'">
+                                            <mat-select  name="{{i.propertyName}}{{www}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="璇烽�夋嫨鑰愮伀绛夌骇" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1绾�</mat-option>
+                                                <mat-option value="1">2绾�</mat-option>
+                                                <mat-option value="2">3绾�</mat-option>
+                                                <mat-option value="3">鍏朵粬</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 濡傛灉绫诲瀷鏄琛屾枃鏈� -->
-                                        <textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
+                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '鑰愮伀绛夌骇'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}{{key}}"></textarea>
     
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="position: absolute;
-                                        left: 205px;
-                                        top: 45px;
-                                        font-size: 11px;
-                                        color: red;">
+                                            left: 205px;
+                                            top: 45px;
+                                            font-size: 11px;
+                                            color: red;">
                                             <span>{{i.rulevalue}}</span>
                                         </div>
                                     </div>
@@ -278,14 +286,14 @@
 
                                         
                                          <!-- 濡傛灉绫诲瀷鏄枃鏈� -->
-                                        <mat-form-field  *ngIf="i.propertyType == 0">
+                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input matInput  name="{{i.propertyName}}" type='text'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
 
                                         <!-- 濡傛灉绫诲瀷鏄暟瀛� -->
-                                        <mat-form-field *ngIf="i.propertyType == 2">
+                                        <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '鑰愮伀绛夌骇'">
                                             <input matInput  name="{{i.propertyName}}" type='number'
                                             required="{{ i.required==true ? 'true' : 'false' }}"
                                             [(ngModel)]="i.propertyValue"
@@ -293,9 +301,17 @@
                                             >
                                             <!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
                                         </mat-form-field>
-                                        
+                                        <!-- 濡傛灉绫诲瀷鏄�愮伀绛夌骇 -->
+                                        <mat-form-field *ngIf="i.propertyName == '鑰愮伀绛夌骇'">
+                                            <mat-select  name="{{i.propertyName}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="璇烽�夋嫨鑰愮伀绛夌骇" [(ngModel)]="i.propertyValue">
+                                                <mat-option value="0">1绾�</mat-option>
+                                                <mat-option value="1">2绾�</mat-option>
+                                                <mat-option value="2">3绾�</mat-option>
+                                                <mat-option value="3">鍏朵粬</mat-option>
+                                            </mat-select>
+                                        </mat-form-field>
                                         <!-- 濡傛灉绫诲瀷鏄琛屾枃鏈� -->
-                                        <textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
+                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '鑰愮伀绛夌骇'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{i.propertyName}}"></textarea>
                                         <span style="color: red;"  *ngIf="i.required">*</span>
                                         <div *ngIf="i.isshowrule" style="    position: absolute;
                                         left: 205px;
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 fa0d039..ea625a8 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
@@ -72,6 +72,17 @@
                         </mat-select>
                     </mat-form-field>
                 </div>
+                <div class="queryField" style="margin-left: 100px;">
+                    <label style="margin-right: 10px;">瀹屾暣搴︽煡璇�:</label>
+                    <mat-form-field class="example-full-width">
+                        <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="璇疯緭鍏ュ畬鏁村害鏈�灏忓��" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
+                    </mat-form-field>
+                    馃爦
+                    <mat-form-field class="example-full-width" style="margin-left: 5px;">
+                        <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="璇疯緭鍏ュ畬鏁村害鏈�澶у��" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
+                    </mat-form-field>
+                </div>
+                
             </div>
             <div style="width: 100%;text-align: center;">
                 <button mat-raised-button color="primary">鏌ヨ</button>
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index eb1b536..03424f3 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -54,6 +54,8 @@ export class KeyUnitManagementComponent implements OnInit {
   tabledataSource:any
   allorganizations:any
   oldDataSource:any; //鍘熷琛ㄦ牸鏁版嵁
+  integrityScoreMin//涓嬬晫
+  integrityScoreMax//涓婄晫
   //琛ㄥご鎺掑簭
   sortData (e) {
     let data = this.tabledataSource.filteredData;
@@ -347,6 +349,8 @@ export class KeyUnitManagementComponent implements OnInit {
       PageSize:  this.pageSizeOptions[0],
       Sort: this.integritySort ? 'integrityscore' : '',
       SortType: this.integritySort || '',
+      IntegrityScoreMin:this.integrityScoreMin||0,
+      IntegrityScoreMax:this.integrityScoreMax||1
     }
     this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
 
@@ -573,7 +577,15 @@ export class KeyUnitManagementComponent implements OnInit {
   onSubmit(value){
     this.PageNumber = 1
     this.pageEvent.pageIndex = 0
-    this.getAllKeyUnit();
+    const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+    if(this.integrityScoreMax<this.integrityScoreMin){
+      this.snackBar.open('鏈�澶у�间笉鑳藉皬浜庢渶灏忓��!','纭畾',config);
+    }else{
+      this.getAllKeyUnit();
+    }
+    
   }
   bigclosediv(e){
     this.isorganizationbox = false
diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html
index 82f5085..8ee2b14 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.html
+++ b/src/app/plan-audit/plan-record/plan-record.component.html
@@ -4,46 +4,65 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-25 15:31:29
+ * @LastEditTime: 2021-01-21 10:12:20
 -->
 <div class="box">
     <div class="boxleft">
         <div class="lefthead">
+          <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
             <div class="headdiv" style="margin-top: 30px;">
-                <span>鎿嶄綔绫诲瀷锛�</span>
-                <input type="radio" name="level"><span>鍏ㄩ儴</span> 
-                <input type="radio" name="level" style="margin-left: 50px;"><span>鏇存柊</span>
-                <input type="radio" name="level" style="margin-left: 50px;"><span>鏂板</span>
-                <input type="radio" name="level" style="margin-left: 50px;"><span>鍒犻櫎</span>
-                <span style="margin-left: 100px;">鍏辫锛�80鏉�</span>
+              <span>鎿嶄綔绫诲瀷锛�</span>
+              <input type="radio" name="level" value="" [(ngModel)]="level"><span>鍏ㄩ儴</span> 
+              <input type="radio" name="level" style="margin-left: 50px;" value="1" [(ngModel)]="level"><span>鏇存柊</span>
+              <input type="radio" name="level" style="margin-left: 50px;" value="0" [(ngModel)]="level"><span>鏂板</span>
+              <input type="radio" name="level" style="margin-left: 50px;" value="2" [(ngModel)]="level"><span>鍒犻櫎</span>
+                <span style="margin-left: 100px;">鍏辫锛歿{count}}鏉�</span>
             </div>
             <div class="headdiv">
                 <span>瀹℃牳鐘舵�侊細</span>
-                <input type="radio" name="passstate"><span>鍏ㄩ儴</span> 
-                <input type="radio" name="passstate" style="margin-left: 50px;"><span>宸查�氳繃</span>
-                <input type="radio" name="passstate" style="margin-left: 50px;"><span>宸叉嫆缁�</span>
+                <input type="radio" name="passstate" [(ngModel)]="verifyState" value=""><span>鍏ㄩ儴</span> 
+                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="1"><span>鍒濆閫氳繃</span>
+                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="2"><span>鍒濆椹冲洖</span>
+                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="4"><span>缁堝閫氳繃</span>
+                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="5"><span>缁堝椹冲洖</span>
             </div>
             <div class="headthree">
                 <span>绫诲瀷锛�</span>
                 <mat-form-field>
-                    <mat-select placeholder='璇烽�夋嫨鍗曚綅绫诲瀷' name="unittype" [(ngModel)]="level">
-                      <mat-option value="1">鈪犵骇</mat-option>
-                      <mat-option value="2">鈪＄骇</mat-option>
-                    </mat-select>
-                </mat-form-field>
-                <span style="margin-left: 30px;">鎵�灞炵粍缁囷細</span>
+                  <mat-select placeholder='璇烽�夋嫨鍗曚綅绫诲瀷' name="unittype" [(ngModel)]="projectlevel">
+                    <mat-option value="1">鈪犵骇棰勬</mat-option>
+                    <mat-option value="2">鈪＄骇棰勬</mat-option>
+                    <mat-option value="3">鈪㈢骇棰勬</mat-option>
+                    <mat-option value="4">鈪ｇ骇棰勬</mat-option>
+                    <mat-option value="5">鈪ょ骇棰勬</mat-option>
+                    <mat-option value="6">搴旀�ラ妗�(鍥藉绾�)</mat-option>
+                    <mat-option value="7">搴旀�ラ妗�(甯傜骇)</mat-option>
+                    <mat-option value="8">绫诲瀷棰勬</mat-option>
+                  </mat-select>
+              </mat-form-field>
+                <span style="margin-left: 30px;">缂栧埗绾у埆锛�</span>
                 <mat-form-field>
-                    <mat-select placeholder='璇烽�夋嫨缁勭粐鏈烘瀯' name="js" [(ngModel)]="js">
-                      <mat-option value="1">鈪犵骇</mat-option>
-                      <mat-option value="2">鈪＄骇</mat-option>
-                    </mat-select>
+                  <mat-select name="preparelevel"  placeholder='璇烽�夋嫨缂栧埗绾у埆' [(ngModel)]="PlanLevel">
+                    <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
+                  </mat-select>
                 </mat-form-field>
-                  <span style="margin-left: 30px;">鏃堕棿锛�</span>
+                  
+            </div>
+            <div class="headfour">
+              <span style="margin-left: 30px;">鏃堕棿锛�</span>
                   <mat-form-field class="example-full-width">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="addtime">
                   </mat-form-field>
+                 <span style="margin-left: 10px;">馃爦</span> 
+                  <mat-form-field class="example-full-width" style="margin-left: 10px;">
+                    <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
+                  </mat-form-field>
+                  <button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >鏌ヨ</button>
+                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 鍒锋柊</button>
             </div>
-            <div class="tablediv">
+          </form>
+            
+            <!-- <div class="tablediv">
                 <table  cellspacing="0" cellpadding="0">
                     <thead>
                         <th style="width: 15%;">绫诲瀷</th>
@@ -64,7 +83,37 @@
                         </tr>
                     </tbody>
                 </table>
-            </div>
+            </div> -->
+            <div class="tablediv">
+              <table  cellspacing="0" cellpadding="0" style="margin-top: 10px;">
+                  <thead>
+                      <th style="width: 15%;">绫诲瀷</th>
+                      <th style="width: 15%;">鎿嶄綔</th>
+                      <th style="width: 15%;">鎵�灞炵粍缁�</th>
+                      <th style="width: 15%;">瀹℃牳鐘舵��</th>
+                      <th style="width: 15%;">鎻愪氦浜�</th>
+                      <th style="width: 25%;">鎻愪氦鏃堕棿</th>
+                  </thead>
+                </table>
+                  <div class="tbodycss" id="tbodydiv" >
+                    <table cellspacing="0" cellpadding="0" id="table" >
+                      <tr *ngFor="let item of tableDate;let key = index" >
+                        <td style="width: 15%;">
+                          <!-- <input type="radio" name="yuan"  value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
+                          {{item.contentType=='1'?'鈪犵骇棰勬':item.contentType=='2'?'鈪＄骇棰勬':item.contentType=='3'?'鈪㈢骇棰勬':item.contentType=='4'?'鈪ｇ骇棰勬':item.contentType=='5'?
+                          '鈪ょ骇棰勬':item.contentType=='6'?'搴旀�ラ妗堬紙鍥藉绾э級':item.contentType=='7'?'搴旀�ラ妗堬紙甯傜骇锛�':item.contentType=='8'?'绫诲瀷棰勬':item.contentType=='11'?'閲嶇偣鍗曚綅':'娑堥槻杞﹁締'}}</td>
+                        <td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'鏂板':item.operation=='1'?'鏇存柊':'鍒犻櫎'}}</td>
+                        <td style="width: 15%;">{{item.verifyOrganizationName}}</td>
+                        <td style="width: 15%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'寰呭垵瀹�':item.verifyState=='1'?
+                          '鍒濆閫氳繃':item.verifyState=='2'?'鍒濆椹冲洖':item.verifyState=='3'?'寰呯粓瀹�':item.verifyState=='4'?'缁堝閫氳繃':'缁堝椹冲洖'}}</td>
+                        <td style="width: 15%;">{{item.creatorName}}</td>
+                        <td style="width: 25%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
+                    </tr>
+                    </table>
+                  </div>
+                  
+              
+          </div>
         </div>
         
     </div>
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 67d555f..14ee4bc 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.scss
+++ b/src/app/plan-audit/plan-record/plan-record.component.scss
@@ -32,10 +32,17 @@
             }
         }
         .tablediv{
-            width: 95%;
-            table{
-                margin: 20px 20px;
+            width: 100%;
+            height: 70%;
+            .tbodycss{
+                overflow-y: auto;
+                height: 600px;
                 width: 100%;
+            }
+            table{
+                //margin: 20px 20px;
+                margin-left: 20px;
+                width: 97%;
                 
                 //border: 1px solid #2196F3;
                 thead{
@@ -45,6 +52,7 @@
                     font-size: 16px;
                     
                 }
+                
                 tr:nth-child(odd){
                     background: #FAFAFA;
                     }
@@ -65,4 +73,13 @@ th,td{
 }
 .green{color: #00C756;}
 .red{color: #FF4D4D;}
-.blue{color: #2196F3;}
\ No newline at end of file
+.blue{color: #2196F3;}
+
+//婊氬姩鏉℃牱寮�
+::-webkit-scrollbar{
+    width: 6px;
+    background-color: white;
+  }
+  ::-webkit-scrollbar-thumb{
+    background-color: #2196F3;
+  }
\ No newline at end of file
diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts
index 9ed4c77..3fc1f35 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -4,10 +4,12 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-25 14:53:46
+ * @LastEditTime: 2021-01-21 10:15:50
  */
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { HttpClient } from '@angular/common/http'
 
 @Component({
   selector: 'app-plan-record',
@@ -16,18 +18,96 @@ import { FormControl } from '@angular/forms';
 })
 export class PlanRecordComponent implements OnInit {
 
-  constructor() { }
+  constructor(private http:HttpClient,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
+    let level = sessionStorage.getItem("level");
+    if(level == "0"){//濡傛灉鏄�婚槦
+      this.preparelevels = [
+        {name:"鎬婚槦",value:"1"},
+        {name:"鏀槦",value:"2"},
+        {name:"澶ч槦",value:"4"},
+        {name:"涓槦",value:"8"}
+      ]
+      this.PlanLevel=0
+    }
+    if(level == "1"){//濡傛灉鏄敮闃�
+      this.preparelevels = [
+        {name:"鏀槦",value:"1"},
+        {name:"澶ч槦",value:"2"},
+        {name:"涓槦",value:"3"}
+      ]
+      this.PlanLevel=1
+    }
+    if(level == "2"){//濡傛灉鏄ぇ闃�
+      this.preparelevels = [
+        {name:"澶ч槦",value:"4"},
+        {name:"涓槦",value:"8"}
+      ]
+      this.PlanLevel=2
+    }
+    if(level == "3"){//濡傛灉鏄腑闃�
+      this.preparelevels = [
+        {name:"涓槦",value:"8"}
+      ]
+      this.PlanLevel=3
+    }
+    this.getAlltabledate()
   }
   selected = new FormControl(0); //閫夐」鍗� 瀹炰緥
-  level//绫诲瀷
-  js//缁勭粐鏈烘瀯
+  preparelevels:any
+  level=''//绫诲瀷
+  verifyState=''//瀹℃牳鐘舵��
+  projectlevel//缁勭粐鏈烘瀯
+  PlanLevel//缂栧埗绾у埆
   addtime//鏃堕棿
-  tableDate=[
-    {level:"鈪犵骇棰勬",option:"鏇存柊",orgication:"娴︿笢鏀槦",unitstate:"宸查�氳繃",addname:"璧典俊",addtime:"2020-12-15 10:36:24"},
-    {level:"娑堢伀鏍�",option:"鏂板",orgication:"闂佃鏀槦",unitstate:"宸叉嫆缁�",addname:"寮犱笁",addtime:"2020-12-15 10:36:24"},
-    {level:"澶╃劧鍙栨按鐐�",option:"鍒犻櫎",orgication:"涓婃捣鎬婚槦",unitstate:"宸叉嫆缁�",addname:"鐜嬩簲",addtime:"2020-12-15 10:36:24"}
-  ]
+  endtime//缁撴潫鏃堕棿
+  count//涓�鍏卞灏戞潯
+  tableDate
+
+  //鑾峰彇琛ㄦ牸鏁版嵁
+  getAlltabledate(){
+    
+    let paramsdata:any = {
+      Operation:this.level||[],
+      ContentType:Number(this.projectlevel)||[],
+      Level:this.PlanLevel||[],
+      verifyState:this.verifyState||[1,2,4,5],
+      QueryStartTime:this.addtime||'',
+      QueryEndTime:this.endtime||''
+    }
+    this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{
+      //console.log(data)
+      this.tableDate=data.items
+      this.count=data.totalCount
+    })
+  }
+  //鎻愪氦鏌ヨ
+  onSubmit(value){
+    //console.log(value)
+    this.getAlltabledate()
+  }
+  //鍒锋柊
+  record(){
+    this.verifyState=''
+    this.level=''
+    this.projectlevel=''
+    this.addtime=''
+    this.endtime=''
+    let level = sessionStorage.getItem("level");
+    if(level == "0"){//濡傛灉鏄�婚槦
+      this.PlanLevel=0
+    }
+    if(level == "1"){//濡傛灉鏄敮闃�
+      this.PlanLevel=1
+    }
+    if(level == "2"){//濡傛灉鏄ぇ闃�
+      this.PlanLevel=2
+    }
+    if(level == "3"){//濡傛灉鏄腑闃�
+      this.PlanLevel=3
+    }
+    this.getAlltabledate()
+  }
 
 }
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index 8c82e5d..a444aff 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-19 14:29:15
+ * @LastEditTime: 2021-01-21 11:17:39
  */
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -165,6 +165,7 @@ export class WaitExamineerComponent implements OnInit {
       this.getAlltabledate()
     })
   }
+  this.chuorzhong=undefined
  }
  //鎷掔粷鎿嶄綔
  refuse(){
@@ -175,7 +176,7 @@ export class WaitExamineerComponent implements OnInit {
     this.snackBar.open('瀹℃牳鏈�氳繃锛岃淇敼鍚庡啀鏉ュ鏍�!','纭畾',config);
   }
 if(this.chuorzhong==0){
-  this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:4}).subscribe(data=>{
+  this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{
     this.snackBar.open('鎿嶄綔鎴愬姛!','纭畾',config);
     this.checked=''
     this.getAlltabledate()
@@ -188,6 +189,7 @@ this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=
   this.getAlltabledate()
 })
 }
+this.chuorzhong=undefined
  }
 
   //鍒嗘暟楗肩姸鍥�
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 805108f..2518591 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-13 10:45:42
+ * @LastEditTime: 2021-01-19 16:21:16
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -36,8 +36,8 @@
                   <mat-form-field>
                     <mat-select name="reservePlanType" formControlName="firstCtrlthree"  placeholder='璇烽�夋嫨棰勬绾у埆'  required>
                       <mat-option value='3'>鈪㈢骇棰勬</mat-option>
-                      <mat-option value='4'>鈪ｇ骇棰勬</mat-option>
-                      <mat-option value='5'>鈪ょ骇棰勬</mat-option>
+                      <mat-option value='4' *ngIf="levels!='1'&&levels!='2'">鈪ｇ骇棰勬</mat-option>
+                      <mat-option value='5' *ngIf="levels!='1'&&levels!='2'">鈪ょ骇棰勬</mat-option>
                     </mat-select>
                   </mat-form-field>
                 </div>
diff --git a/src/app/plan-management/entry-plan-look/auditresult.html b/src/app/plan-management/entry-plan-look/auditresult.html
index 2c61b7e..e393c41 100644
--- a/src/app/plan-management/entry-plan-look/auditresult.html
+++ b/src/app/plan-management/entry-plan-look/auditresult.html
@@ -1,15 +1,29 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:09:15
+-->
 <div style="text-align: center;">
     <span  mat-dialog-title>瀹℃壒缁撴灉</span>
 </div>
 
 <div class="auditDiv">
     <p>棰勬鍚嶇О锛歿{planName}}</p>
-    <p>鎻愪氦鏃堕棿锛歿{commitTime|  date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鎻愪氦鏃堕棿锛歿{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>鍙戣捣鐢宠锛歿{commitOrganizationName }}</p>
     <mat-divider></mat-divider>
-    <p>瀹℃壒澶ч槦锛歿{auditOrganizationName}}</p>
-    <p>瀹℃壒缁撴灉锛歿{auditResult | auditsatus}}</p>
-    <p>瀹℃壒鎰忚锛歿{auditOpinion}}</p>
+    <p>鍒濆鏃堕棿锛歿{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍒濆鏈烘瀯锛歿{data.element.firstAuditorName}}</p>
+    <p>鍒濆鎰忚锛歿{data.element.firstAuditOpinion}}</p>
+    <p>鍒濆缁撴灉锛歿{data.element.auditStatus==16?'寰呯粓瀹�':data.element.auditStatus==32?'鍒濆閫�鍥�':''}}</p>
+    <mat-divider></mat-divider>
+    <p>缁堝鏃堕棿锛歿{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>缁堝鏈烘瀯锛歿{data.element.auditorOrganizationName}}</p>
+    <p>缁堝鎰忚锛歿{data.element.auditOpinion}}</p>
+    <p>缁堝缁撴灉锛歿{data.element.auditStatus==2?'缁堝閫氳繃':data.element.auditStatus==4?'缁堝閫�鍥�':''}}</p>
 </div>
 
 
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index a1562de..1a809b8 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-21 15:10:08
+-->
 <!-- <p>褰曞叆棰勬</p> -->
 <div class="header" style="position: relative;">
     <div>
@@ -52,7 +60,8 @@
     
             <ng-container matColumnDef="auditstate">
                 <th mat-header-cell *matHeaderCellDef>瀹℃牳鐘舵��</th>
-                <td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td>
+                <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':element.auditStatus=='4'?
+                    '瀹℃牳閫�鍥�':element.auditStatus=='16'?'鍒濆閫氳繃':'鍒濆椹冲洖'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
                 <th mat-header-cell *matHeaderCellDef>鏄惁鍏紑</th>
@@ -71,7 +80,6 @@
                     <span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">涓嬭浇</span>
                     <span (click)="deletePlan(element)">鍒犻櫎</span>
                     <span (click)="auditResult(element)">瀹℃壒缁撴灉</span>
-
                     <span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4"  [ngClass]="{'grey': element.auditStatus == '2'}">鎻愪氦瀹℃牳</span>
                     <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">鎾ら攢瀹℃牳</span>
                 </td>
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
index 724d4aa..d8267e4 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
@@ -433,7 +433,7 @@ export class AddPlanone {
   
   
   ngOnInit(): void {
-    
+    this.levels=sessionStorage.getItem("level")
     this.firstFormGroup = this._formBuilder.group({
       firstCtrlone: ['', Validators.required],
       firstCtrltwo: ['', Validators.required],
@@ -447,6 +447,7 @@ export class AddPlanone {
   onNoClick(): void {
     this.dialogRef.close();
   }
+  levels//
   isup:boolean = true //涓婁紶input妗嗘槸鍚︽樉绀�
   isweb:boolean = false //web杈撳叆妗嗘槸鍚︽樉绀�
   isinput:boolean = false //瀵煎叆鏄惁鏄剧ず
@@ -810,6 +811,7 @@ export class AddPlanone {
             name: this.selectedPLanName,
             planType:Number(this.selectedPLanType),
             planMode: Number(this.defaultisshow),
+            planCategory: Number(this.selectedPLanLevel),
             planLevel: PlanLevel,
             url: this.webaddress,
             attachmentUrls: null
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 4853099..b4d9df3 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -119,7 +119,8 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">瀹℃牳鐘舵��</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':'瀹℃牳閫�鍥�'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':element.auditStatus=='4'?
+              '瀹℃牳閫�鍥�':element.auditStatus=='16'?'鍒濆閫氳繃':'鍒濆椹冲洖'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">鏄惁鍏紑</th>
@@ -135,6 +136,7 @@
                   <span  style="color: blue;">鏌ョ湅棰勬</span>
                   <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 ||  element.auditStatus == 4"  >鎻愪氦瀹℃牳</span>
                   <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">鎾ら攢瀹℃牳</span>
+                  <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">瀹℃壒缁撴灉</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>涓嬭浇</span>
                   <span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 鍒犻櫎</span>
                 </td>
@@ -144,7 +146,8 @@
         </table>
             <mat-paginator pageEvent [length]="length"
                 [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions">
+                [pageSizeOptions]="pageSizeOptions"
+                (page)="changePage($event)">
                 
             </mat-paginator>
         
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 6b4385f..e1288e2 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.scss
+++ b/src/app/plan-management/meet-plan/meet-plan.component.scss
@@ -149,4 +149,10 @@
         // margin-left: 160px;
     }
 
+}
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 875e4e8..8ff1a69 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -100,6 +100,11 @@ export class MeetPlanComponent implements OnInit {
       this.tabledataSource = data.items
     })
   }
+  //鍒嗛〉浜嬩欢
+  changePage(e){
+    this.PageNumber = e.pageIndex+1
+    this.getAlltabledate()
+  }
 
   //鏌ヨ
   onSubmit (value) {
@@ -278,8 +283,20 @@ export class MeetPlanComponent implements OnInit {
     }
     );
   }
+
+  //瀹℃牳缁撴灉
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(meetAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
+  }
 }
 
+//鏂板缓
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -508,3 +525,25 @@ export class newunitMeet{
     this.dialogRef.close();
   }
 }
+
+//鏌ョ湅瀹℃牳缁撴灉
+@Component({
+  selector: 'resultmeet',
+  templateUrl: './resultmeetPlan.html',
+  styleUrls: ['./meet-plan.component.scss']
+})
+export class meetAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<meetAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
\ No newline at end of file
diff --git a/src/app/plan-management/meet-plan/resultmeetPlan.html b/src/app/plan-management/meet-plan/resultmeetPlan.html
new file mode 100644
index 0000000..82110af
--- /dev/null
+++ b/src/app/plan-management/meet-plan/resultmeetPlan.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:09:00
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>瀹℃壒缁撴灉</span>
+</div>
+
+<div class="auditDiv">
+    <p>棰勬鍚嶇О锛歿{planName}}</p>
+    <p>鎻愪氦鏃堕棿锛歿{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍙戣捣鐢宠锛歿{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>鍒濆鏃堕棿锛歿{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍒濆鏈烘瀯锛歿{data.element.firstAuditorName}}</p>
+    <p>鍒濆鎰忚锛歿{data.element.firstAuditOpinion}}</p>
+    <p>鍒濆缁撴灉锛歿{data.element.auditStatus==16?'寰呯粓瀹�':data.element.auditStatus==32?'鍒濆閫�鍥�':''}}</p>
+    <mat-divider></mat-divider>
+    <p>缁堝鏃堕棿锛歿{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>缁堝鏈烘瀯锛歿{data.element.auditorOrganizationName}}</p>
+    <p>缁堝鎰忚锛歿{data.element.auditOpinion}}</p>
+    <p>缁堝缁撴灉锛歿{data.element.auditStatus==2?'缁堝閫氳繃':data.element.auditStatus==4?'缁堝閫�鍥�':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">鍏抽棴</button>
+</div>
\ No newline at end of file
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 c62aee1..e634de5 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,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-19 15:01:55
+ * @LastEditTime: 2021-01-21 15:02:25
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
@@ -119,7 +119,8 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">瀹℃牳鐘舵��</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':'瀹℃牳閫�鍥�'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':element.auditStatus=='4'?
+              '瀹℃牳閫�鍥�':element.auditStatus=='16'?'鍒濆閫氳繃':'鍒濆椹冲洖'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">鏄惁鍏紑</th>
@@ -133,8 +134,9 @@
                 <th mat-header-cell *matHeaderCellDef style="width: 20%;">鎿嶄綔</th>
                 <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
                     <span  style="color: blue;">鏌ョ湅棰勬</span>
-                    <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 ||  element.auditStatus == 4"  [ngClass]="{'grey': element.auditStatus == '2'}">鎻愪氦瀹℃牳</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 "  >鎻愪氦瀹℃牳</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">鎾ら攢瀹℃牳</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">瀹℃壒缁撴灉</span>
                     <!-- <span style="color: blue;margin-left: 4px;"  *ngIf="element.auditStatus == 2">瀹℃牳閫氳繃</span> -->
                     <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>涓嬭浇</span>
                     <span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 鍒犻櫎</span>
@@ -145,7 +147,8 @@
         </table>
             <mat-paginator pageEvent [length]="length"
                 [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions">
+                [pageSizeOptions]="pageSizeOptions"
+                (page)="changePage($event)">
                 
             </mat-paginator>
         
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 06f4edd..b801081 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
@@ -149,4 +149,11 @@
         // margin-left: 160px;
     }
 
+}
+
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 9b4d3f1..693ad3a 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,12 +4,13 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-19 14:55:16
+ * @LastEditTime: 2021-01-21 14:32:43
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { MatPaginator } from '@angular/material/paginator';
+
 import { FlatTreeControl } from '@angular/cdk/tree';
 import { FormControl } from '@angular/forms';
 import { Router,ActivatedRoute } from '@angular/router'
@@ -108,9 +109,13 @@ export class OnetwoEntryPlanComponent implements OnInit {
     this.http.get("/api/PlanComponentsMajor",{params:paramsdata}).subscribe((data:any)=>{
       this.length = data.totalCount
       this.tabledataSource = data.items
-      console.log(this.tabledataSource)
     })
   }
+  //鍒嗛〉浜嬩欢
+  changePage(e){
+    this.PageNumber = e.pageIndex+1
+    this.getAlltabledate()
+  }
 
   //閲嶇疆
   reset(){
@@ -193,6 +198,17 @@ export class OnetwoEntryPlanComponent implements OnInit {
     }
     );
   }
+
+  //瀹℃牳缁撴灉
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(onetwoAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
+  }
   //涓嬭浇鈫�
   selectDownloadFile:any; //閫夋嫨涓嬭浇鐨勬枃浠�
   download:any; //涓嬭浇鏂囦欢鍏冩暟鎹�
@@ -301,6 +317,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
 
 }
 
+//鏂板缓
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -526,3 +543,25 @@ export class newunitComponent{
     this.dialogRef.close();
   }
 }
+
+//鏌ョ湅瀹℃牳缁撴灉
+@Component({
+  selector: 'resultonetwo',
+  templateUrl: './resultPlanonetwo.html',
+  styleUrls: ['./onetwo-entry-plan.component.scss']
+})
+export class onetwoAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<onetwoAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
\ No newline at end of file
diff --git a/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
new file mode 100644
index 0000000..1b71f36
--- /dev/null
+++ b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:07:50
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>瀹℃壒缁撴灉</span>
+</div>
+
+<div class="auditDiv">
+    <p>棰勬鍚嶇О锛歿{planName}}</p>
+    <p>鎻愪氦鏃堕棿锛歿{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍙戣捣鐢宠锛歿{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>鍒濆鏃堕棿锛歿{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍒濆鏈烘瀯锛歿{data.element.firstAuditorName}}</p>
+    <p>鍒濆鎰忚锛歿{data.element.firstAuditOpinion}}</p>
+    <p>鍒濆缁撴灉锛歿{data.element.auditStatus==16?'寰呯粓瀹�':data.element.auditStatus==32?'鍒濆閫�鍥�':''}}</p>
+    <mat-divider></mat-divider>
+    <p>缁堝鏃堕棿锛歿{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>缁堝鏈烘瀯锛歿{data.element.auditorOrganizationName}}</p>
+    <p>缁堝鎰忚锛歿{data.element.auditOpinion}}</p>
+    <p>缁堝缁撴灉锛歿{data.element.auditStatus==2?'缁堝閫氳繃':data.element.auditStatus==4?'缁堝閫�鍥�':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">鍏抽棴</button>
+</div>
\ No newline at end of file
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 38ebbd4..8c34ed6 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -73,6 +73,26 @@
           </mat-form-field>
           <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">鍖呭惈涓嬬骇</mat-checkbox>
         </div>
+        <div class="queryField">
+          <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-form-field class="example-full-width">
+            <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
+          </mat-form-field>
+        </div>
+        <div class="queryField" style="margin-left: 100px;">
+          <label style="margin-right: 10px;">瀹屾暣搴︽煡璇�:</label>
+          <mat-form-field class="example-full-width">
+              <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="璇疯緭鍏ュ畬鏁村害鏈�灏忓��" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
+          </mat-form-field>
+          馃爦
+          <mat-form-field class="example-full-width" style="margin-left: 5px;">
+              <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="璇疯緭鍏ュ畬鏁村害鏈�澶у��" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
+          </mat-form-field>
+      </div>
   
       </div>
       <div style="width: 100%;text-align: center;">
@@ -86,14 +106,130 @@
     <div class="tablebox">
 
         <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
-          <ng-container matColumnDef="unitname">
+          <!-- <ng-container matColumnDef="unitname">
             <th mat-header-cell *matHeaderCellDef>鍗曚綅鍚嶇О</th>
             <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
-          </ng-container>
+          </ng-container> -->
           <ng-container matColumnDef="planname">
             <th mat-header-cell *matHeaderCellDef>棰勬鍚嶇О</th>
             <td mat-cell *matCellDef="let element">{{element.name}}</td>
           </ng-container>
+          <!-- <ng-container matColumnDef="integrity" >
+            <th mat-header-cell *matHeaderCellDef style="text-align: center;">淇℃伅瀹屾暣搴﹀緱鍒�</th>
+            <td mat-cell *matCellDef="let element;let i = index">
+                <div class="integrityDiv">
+                    <span class="integrityNum">
+                        {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}鍒�
+                    </span>
+                    <div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
+                    </div>
+                    <div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
+                        <div class="integrityDetailsTop">
+                            <span class="span1">鍒嗙被鍚嶇О</span>
+                            <span class="span2">宸插緱鍒�</span>
+                            <span class="span3">鎬诲垎</span>
+                        </div>
+                        <div class="integrityDetailsBody">
+                            <ul> 
+                                <li>
+                                    <div class="name">鍗曚綅淇℃伅</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">5鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">寤虹瓚淇℃伅</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">骞抽潰鍥�</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">鍥涘懆姣楅偦</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">娑堥槻璁炬柦</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">25鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">閲嶇偣閮ㄤ綅</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">鍔熻兘鍒嗗尯</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">瀹炴櫙鍥�</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                                <li>
+                                    <div class="name">CAD涓婁紶</div>
+                                    <div class="colorDiv">
+                                        <div class="colorDivBac">
+                                            <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
+                                        </div>
+                                        <span>{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}鍒�</span>
+                                    </div>
+                                    <div  class="number">10鍒�</div>
+                                </li>
+                            </ul>
+                        </div>
+                        <div style="width: 100%;text-align: center;font-size: 13px;">
+                            浠呬緵鍙傝��
+                        </div>
+                    </div>
+                </div>
+            </td>
+        </ng-container> -->
           <ng-container matColumnDef="addpeople">
             <th mat-header-cell *matHeaderCellDef>娣诲姞浜�</th>
             <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
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 3769e5e..59b2a1b 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.scss
+++ b/src/app/plan-management/pass-plan/pass-plan.component.scss
@@ -89,4 +89,121 @@
 .mat-cell{
     text-align: center;
     
+}
+
+//瀹屾暣搴�
+.integrityDiv{
+    width: 180px;
+    height: 30px;
+    background-color: #e2e7ee;
+    // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
+    margin: 0 auto;
+    position: relative;
+    .integrityNum{
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        color: black;
+        font-weight: 800;
+        font-size: 15px;
+        cursor: default;
+    }
+    .integrityColorDiv{
+        height: 100%;
+    }
+    .integrityDetails{
+        position: absolute;
+        display: none;
+        width: 350px;
+        height:280px;
+        border: 1px solid rgba(0, 0, 0, 0.22);
+        background-color: white;
+        .integrityDetailsTop{
+            width: 100%;
+            height: 23px;
+            line-height:23px;
+            border-bottom: 1px solid rgba(0, 0, 0, 0.22);
+            margin-bottom: 1px;
+            font-size: 14px;
+            span{
+                display: inline-block;
+                text-align: center;
+                font-weight: 800;
+            }
+            .span1{
+                width: 25%;
+            }
+            .span2{
+                width: 60%;
+            }
+            .span3{
+                width: 15%;
+            }
+        }
+        .integrityDetailsBody{
+            ul{
+                li{
+                    width: 100%;
+                    height: 23px;
+                    line-height: 23px;
+                    margin: 3px 0;
+                    div{
+                        float: left;
+                        font-size: 13px;
+                    }
+                    .name{
+                        width: 25%;
+                        height: 100%;
+                    }
+                    .colorDiv{
+                        width: 60%;
+                        height: 100%;
+                        position: relative;
+                        .colorDivBac{
+                            width: 90%;
+                            height: 100%;
+                            position: absolute;
+                            left: 50%;
+                            top: 50%;
+                            transform: translate(-50%,-50%);
+                            background-color: #dfe5ec;
+                            border-radius: 5px;
+                            .colorDivCon{
+                                border-radius: 5px;
+                                height: 100%;
+                                background-color: #2398f1;
+                            }
+                        }
+                        span{
+                            position: absolute;
+                            left: 50%;
+                            top: 50%;
+                            transform: translate(-50%,-50%);
+                            // color: white;
+                            font-weight: 600;
+                        }
+                    }
+                    .number{
+                        width: 15%;
+                        height: 100%;
+                    }
+                }
+            }
+            
+        }
+    }
+    .bottomposition{
+        top: 2px;
+        left: 188px;
+    }
+    .topposition{
+        top: -252px;
+        left: 188px;
+    }
+}
+.integrityDiv:hover{
+    .integrityDetails{
+        display: block;
+    }
 }
\ No newline at end of file
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 6a3bf37..0f0334d 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //璁剧疆姣忛〉鏉℃暟
   PageNumber:any; //绗嚑椤�
 
-  displayedColumns: string[] = ['unitname', 'planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
+  displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
   allorganizations:any //鎵�鏈夌粍缁囨満鏋�
   allunittype:any //鎵�鏈夊崟浣嶇被鍨�
   tabledataSource:any //琛ㄦ牸鏁版嵁
@@ -108,6 +108,121 @@ export class PassPlanComponent implements OnInit {
     })
   }
 
+  colorRgb(sColor){
+    var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+    var sColor = sColor.toLowerCase();
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            var sColorNew = "#";
+            for (var i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
+            }
+            sColor = sColorNew;
+        }
+        //澶勭悊鍏綅鐨勯鑹插��
+        var sColorChange = [];
+        for (var i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
+        }
+        return sColorChange;
+    } else {
+        return sColor;
+    }
+  }
+  colorHex(rgb){
+    var _this = rgb;
+    var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+    if (/^(rgb|RGB)/.test(_this)) {
+        var aColor = _this.replace(/(?:(|)|rgb|RGB)*/g, "").split(",");
+        var strHex = "#";
+        for (var i = 0; i < aColor.length; i++) {
+            var hex:any = Number(aColor[i]).toString(16);
+            hex = hex < 10 ? 0 + '' + hex : hex;// 淇濊瘉姣忎釜rgb鐨勫�间负2浣�
+            if (hex === "0") {
+                hex += hex;
+            }
+            strHex += hex;
+        }
+        if (strHex.length !== 7) {
+            strHex = _this;
+        }
+        return strHex;
+    } else if (reg.test(_this)) {
+        var aNum = _this.replace(/#/, "").split("");
+        if (aNum.length === 6) {
+            return _this;
+        } else if (aNum.length === 3) {
+            var numHex = "#";
+            for (var i = 0; i < aNum.length; i += 1) {
+                numHex += (aNum[i] + aNum[i]);
+            }
+            return numHex;
+        }
+    } else {
+        return _this;
+    }
+  }
+
+  gradientColor(startColor, endColor, step) {
+    let _this = this
+    let  startRGB = _this.colorRgb(startColor);//杞崲涓簉gb鏁扮粍妯″紡
+    let  startR = startRGB[0];
+    let  startG = startRGB[1];
+    let  startB = startRGB[2];
+
+    let  endRGB = _this.colorRgb(endColor);
+    let  endR = endRGB[0];
+    let  endG = endRGB[1];
+    let  endB = endRGB[2];
+
+    let  sR = (endR - startR) / step;//鎬诲樊鍊�
+    let  sG = (endG - startG) / step;
+    let  sB = (endB - startB) / step;
+
+    var colorArr = [];
+    for (var i = 0; i < step; i++) {
+        //璁＄畻姣忎竴姝ョ殑hex鍊� 
+        var hex = _this.colorHex('rgb('+ parseInt((sR * i + startR))+ ',' + parseInt((sG * i + startG))+ ',' + parseInt((sB * i + startB)) + ')');
+        colorArr.push(hex);
+    }
+    return colorArr;
+}
+  integrity(width){
+    let _this = this
+    
+    let style:any = {}
+    style.width = width +'%';
+    if(width < 30){
+      let colorArr = this.gradientColor('#D50000', '#E53935', 30);  
+      for(let i = 0; i < 30; i++){
+        if( i == width){
+          style.background = colorArr[i]
+        }
+      }
+    }
+    if(width >= 30 && width < 60){
+      let colorArr = this.gradientColor('#FF9800', '#E65100', 30);  
+      for(let i = 30; i < 60; i++){
+        if( i == width){
+          style.background = colorArr[i-30]
+        }
+      }
+    }
+    if(width >= 60){
+      let colorArr = this.gradientColor('#81C784', '#2E7D32', 41);  
+      for(let i = 60; i <= 100; i++){
+        if( i == width){
+          style.background = colorArr[i-60]
+        }
+      }
+    }
+    return style
+  }
+  integrityDetails(width,zong){
+    let style:any = {}
+    style.width = (width/zong)*100 +'%';
+    return style
+  }
 
 
 
@@ -119,6 +234,10 @@ export class PassPlanComponent implements OnInit {
       }
     )
   }
+  addtime//寮�濮嬫椂闂�
+  endtime//缁撴潫鏃堕棿
+  integrityScoreMin//瀹屾暣搴︽渶灏忓��
+  integrityScoreMax//瀹屾暣搴︽渶澶у��
   organizationName:any //褰撳墠鍗曚綅缁勭粐鏈烘瀯鍚嶇О
   treedata:any //缁勭粐鏈烘瀯鏍戝瀷鏁版嵁
   newArr:any = []
diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts
index 3c10cd0..0cadd06 100644
--- a/src/app/plan-management/plan-management.module.ts
+++ b/src/app/plan-management/plan-management.module.ts
@@ -57,12 +57,15 @@ import { newunitMeet }from './meet-plan/meet-plan.component';
 import { TypePlanComponent } from './type-plan/type-plan.component';
 import { newunitType }from './type-plan/type-plan.component';
 import { PsViewer } from './entry-plan-look/entry-plan-look.component'
+import { onetwoAuditResult } from './onetwo-entry-plan/onetwo-entry-plan.component';
+import { meetAuditResult }from './meet-plan/meet-plan.component';
+import { typeAuditResult } from './type-plan/type-plan.component'
 
 
 
 @NgModule({
   declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, 
-    WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer],
+    WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer,onetwoAuditResult,meetAuditResult,typeAuditResult],
   imports: [
     CommonModule,
     PlanManagementRoutingModule,
diff --git a/src/app/plan-management/type-plan/resulttypePlan.html b/src/app/plan-management/type-plan/resulttypePlan.html
new file mode 100644
index 0000000..94fbc01
--- /dev/null
+++ b/src/app/plan-management/type-plan/resulttypePlan.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:08:43
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>瀹℃壒缁撴灉</span>
+</div>
+
+<div class="auditDiv">
+    <p>棰勬鍚嶇О锛歿{planName}}</p>
+    <p>鎻愪氦鏃堕棿锛歿{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍙戣捣鐢宠锛歿{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>鍒濆鏃堕棿锛歿{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>鍒濆鏈烘瀯锛歿{data.element.firstAuditorName}}</p>
+    <p>鍒濆鎰忚锛歿{data.element.firstAuditOpinion}}</p>
+    <p>鍒濆缁撴灉锛歿{data.element.auditStatus==16?'寰呯粓瀹�':data.element.auditStatus==32?'鍒濆閫�鍥�':''}}</p>
+    <mat-divider></mat-divider>
+    <p>缁堝鏃堕棿锛歿{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>缁堝鏈烘瀯锛歿{data.element.auditorOrganizationName}}</p>
+    <p>缁堝鎰忚锛歿{data.element.auditOpinion}}</p>
+    <p>缁堝缁撴灉锛歿{data.element.auditStatus==2?'缁堝閫氳繃':data.element.auditStatus==4?'缁堝閫�鍥�':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">鍏抽棴</button>
+</div>
\ No newline at end of file
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 c6acccc..dc12cb5 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -97,7 +97,8 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">瀹℃牳鐘舵��</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':'瀹℃牳閫�鍥�'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'鏈彁浜ゅ鏍�':element.auditStatus=='1'?'瀹℃牳涓�':element.auditStatus=='2'?'瀹℃牳閫氳繃':element.auditStatus=='4'?
+              '瀹℃牳閫�鍥�':element.auditStatus=='16'?'鍒濆閫氳繃':'鍒濆椹冲洖'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">鏄惁鍏紑</th>
@@ -111,8 +112,9 @@
                 <th mat-header-cell *matHeaderCellDef style="width: 20%;">鎿嶄綔</th>
                 <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
                   <span  style="color: blue;">鏌ョ湅棰勬</span>
-                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 ||  element.auditStatus == 4"  >鎻愪氦瀹℃牳</span>
+                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 "  >鎻愪氦瀹℃牳</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">鎾ら攢瀹℃牳</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">瀹℃壒缁撴灉</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>涓嬭浇</span>
                   <span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 鍒犻櫎</span>
                 </td>
@@ -122,7 +124,8 @@
         </table>
             <mat-paginator pageEvent [length]="length"
                 [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions">
+                [pageSizeOptions]="pageSizeOptions"
+                (page)="changePage($event)">
                 
             </mat-paginator>
         
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 71cadc2..43059ae 100644
--- a/src/app/plan-management/type-plan/type-plan.component.scss
+++ b/src/app/plan-management/type-plan/type-plan.component.scss
@@ -149,4 +149,10 @@
         // margin-left: 160px;
     }
 
+}
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 623917f..0a1163c 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-01-15 15:15:49
+ * @LastEditTime: 2021-01-21 14:15:40
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -99,6 +99,11 @@ export class TypePlanComponent implements OnInit {
       this.tabledataSource = data.items
     })
   }
+  //鍒嗛〉浜嬩欢
+  changePage(e){
+    this.PageNumber = e.pageIndex+1
+    this.getAlltabledate()
+  }
 
   //閲嶇疆
   reset(){
@@ -179,6 +184,16 @@ export class TypePlanComponent implements OnInit {
     }
     );
     
+  }
+  //瀹℃牳缁撴灉
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(typeAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
   }
 
   //涓嬭浇鈫�
@@ -282,6 +297,7 @@ export class TypePlanComponent implements OnInit {
 
 }
 
+//鏂板缓
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -500,3 +516,25 @@ export class newunitType{
     this.dialogRef.close();
   }
 }
+
+//鏌ョ湅瀹℃牳缁撴灉
+@Component({
+  selector: 'resultmeet',
+  templateUrl: './resulttypePlan.html',
+  styleUrls: ['./type-plan.component.scss']
+})
+export class typeAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<typeAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 701098a..dfc085f 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -284,7 +284,7 @@
                   [(ngModel)]="sliderValue" (change)="assetAngleIunput()"  [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)"></mat-slider>
               </div>
             </div>
-            <!-- 濡傛灉鏄鐐硅繛绾� -->
+            <!-- 濡傛灉鏄鐐硅繛绾� 鎴栬�� 鐭㈤噺鍥�-->
             <div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3">
               <p>鍘氬害</p>
               <div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
@@ -399,8 +399,8 @@
                   <option value ="4" [selected]="item.PropertyValue ==4">娑堥槻</option>
                 </select>
               </div>
+            </div>
           </div>
-        </div>
         
         </div>
         <!-- 娑堥槻瑕佺礌 -->
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index add640d..42b4a9c 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -971,6 +971,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     this.createNodeShape(this.canvasData.selectPanelPoint.Data);
     this.createAxLegend();
   }
+  /**
+   * 鍔犺浇鏃犲叧鑱斾俊鎭缃妗�
+   * @data 澶勭疆棰勬鏁版嵁
+  */
+  public async loadNoRelevantInformationDisposalPlan(data:DisposalNodeData): Promise<void> {
+    await this.refreshBackgroundImage(data.BackgroundImageUrl,data.BackgroundImageAngle);
+    // 娓呯┖鎵�鏈夊浘褰�
+    this.selection.deselectAll();
+    const itemList = [];
+    this.backgroundImage.children.forEach(item => {
+      if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) {
+          itemList.push(item.name);
+      }
+    });
+
+    itemList.forEach(item => {
+      this.backgroundImage.getChildByName(item).destroy();
+    });
+    // 鍒涘缓澶勭疆棰勬鍥惧舰
+    this.createNodeShape(this.canvasData.selectPanelPoint.Data);
+  }
   /**
    * 鍒涘缓瀹変俊鍥句緥
    */
diff --git a/src/styles.scss b/src/styles.scss
index aee0200..2ef5a9e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -129,7 +129,7 @@ table td.mat-footer-cell:last-of-type{
 	
 }
 //寮瑰嚭妗嗘牱寮忓彇娑坧adding
-#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater{
+#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater,#videodialog{
 	padding: 0;
 }