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 7ba8402..14887f7 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-02-06 16:44:05
+ * @LastEditTime: 2021-02-07 14:37:44
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -156,8 +156,10 @@ export class WaitExamineerComponent implements OnInit {
   radioClick(e,item){
     //e.target.parentElement.bgColor='#2196F3'
     console.log(e,item)
+    this.organizationName=''
     this.id=item.id
     this.fetchUrl=''
+    this.viewer={}
     this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
       console.log(data)
       this.companyId=data.companyId
@@ -242,20 +244,35 @@ export class WaitExamineerComponent implements OnInit {
   //查看二维三维预案
   thirdPartyURL
   planType
+  twoOrthree
   handleData () {
+    this.compantData={name:'',buildingTypes:[],address:''}
     this.planType = this.planData.planMode
     let data = this.planData
-    console.log(this.planData)
+    console.log(data)
+    if(data.planType==1){
+      this.twoOrthree=2
+    }else if(data.planType==2){
+      this.twoOrthree=3
+    }
     if (this.planData.planMode==0) { //预案planMode=0时, 查看word
       //this.lookWord()
     } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档
 
     } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件
+      this.showtype=2
+      this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
+        data && data.company? this.compantData = data.company : null
+      })
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
       sessionStorage.setItem("companyId",this.companyId);
       sessionStorage.setItem("planId",this.id);
       sessionStorage.setItem("editable",'0');
-    } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址
+      sessionStorage.setItem("planName",data.name)
+      let companyId = sessionStorage.getItem("companyId")
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
+    } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
       this.showtype=2
       this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
         data && data.company? this.compantData = data.company : null
@@ -268,7 +285,7 @@ export class WaitExamineerComponent implements OnInit {
 
   //打开三维预案弹窗
   oopen3Dshow(){
-    this.dialog.open(show3D,{width:'1550px',height:'850px',data:{url:this.thirdPartyURL}});
+    this.dialog.open(show3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree}});
   }
   //变更数据和全部数据切换按钮
   buttonChange(){
@@ -505,7 +522,7 @@ export class WaitExamineerComponent implements OnInit {
 export class show3D{
   constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<show3D>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
   ngOnInit(): void {
-    console.log(this.data.url.changingThisBreaksApplicationSecurity)
+    console.log(this.data)
     this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity)
   }
   threedUrl
diff --git a/src/app/plan-management/entry-plan-look/auditresult.html b/src/app/plan-management/entry-plan-look/auditresult.html
index e393c41..415d0ef 100644
--- a/src/app/plan-management/entry-plan-look/auditresult.html
+++ b/src/app/plan-management/entry-plan-look/auditresult.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-20 17:09:15
+ * @LastEditTime: 2021-02-07 13:58:53
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -16,7 +16,7 @@
     <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.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
     <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
     <mat-divider></mat-divider>
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 4de8762..5a24607 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -413,8 +413,10 @@ export class newunitMeet{
         disasterType: this.reservePlanType,
         PlanLevel:PlanLevel,
         PlanMode:1,
+        planType:16,
         attachmentUrls:[`${this.objectName}`]
       }
+      console.log(body)
       this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
         this.snackBar.open('创建成功!','确定',config);
         //console.log(data) 
@@ -505,6 +507,7 @@ export class newunitMeet{
       disasterType: this.reservePlanType,
       PlanLevel:PlanLevel,
       PlanMode:1,
+      planType:16,
       attachmentUrls:[`${this.objectName}`]
     }
     this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
diff --git a/src/app/plan-management/meet-plan/resultmeetPlan.html b/src/app/plan-management/meet-plan/resultmeetPlan.html
index 82110af..6916a79 100644
--- a/src/app/plan-management/meet-plan/resultmeetPlan.html
+++ b/src/app/plan-management/meet-plan/resultmeetPlan.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-20 17:09:00
+ * @LastEditTime: 2021-02-07 13:58:01
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -16,7 +16,7 @@
     <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.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
     <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
     <mat-divider></mat-divider>
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 329757d..3a92ba4 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-05 14:52:32
+ * @LastEditTime: 2021-02-07 16:13:54
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -436,6 +436,7 @@ export class newunitComponent{
         disasterType: this.reservePlanType,
         PlanLevel:PlanLevel,
         PlanMode:1,
+        planType:16,
         attachmentUrls:[`${this.objectName}`]
       }
       this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
@@ -527,6 +528,7 @@ export class newunitComponent{
       disasterType: this.reservePlanType,
       PlanLevel:PlanLevel,
       PlanMode:1,
+      planType:16,
       attachmentUrls:[`${this.objectName}`]
     }
     
diff --git a/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
index 1b71f36..3c68db2 100644
--- a/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
+++ b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-20 17:07:50
+ * @LastEditTime: 2021-02-07 13:58:29
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -16,7 +16,7 @@
     <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.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
     <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
     <mat-divider></mat-divider>
diff --git a/src/app/plan-management/type-plan/resulttypePlan.html b/src/app/plan-management/type-plan/resulttypePlan.html
index 94fbc01..fd65981 100644
--- a/src/app/plan-management/type-plan/resulttypePlan.html
+++ b/src/app/plan-management/type-plan/resulttypePlan.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-20 17:08:43
+ * @LastEditTime: 2021-02-07 13:58:16
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -16,7 +16,7 @@
     <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.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
     <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
     <mat-divider></mat-divider>
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 a96af3f..cda585b 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-02-06 09:12:05
+ * @LastEditTime: 2021-02-07 16:13:27
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -409,6 +409,7 @@ export class newunitType{
         PlanLevel:PlanLevel,
         PlanMode:1,
         PlanType:8,
+        planType:16,
         attachmentUrls:[`${this.objectName}`]
       }
       this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
@@ -500,6 +501,7 @@ export class newunitType{
       PlanLevel:PlanLevel,
       PlanMode:1,
       PlanType:8,
+      planType:16,
       attachmentUrls:[`${this.objectName}`]
     }