From 35fbd6501c3cee6a756d92224d463f0812a23c0b Mon Sep 17 00:00:00 2001
From: chenjingyu <1148019379@qq.com>
Date: Mon, 24 Jan 2022 17:04:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=B8=8B=E8=BD=BD=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E8=BD=AC=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-plan-online-five.component.ts      | 23 ++++++++++---------
 .../entry-plan-look.component.ts              |  7 +++---
 .../entry-plan-look/upNew.html                |  6 +++--
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index 8a8784d..2dd05cc 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -79,12 +79,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       this.selectedItem='封面'
       this.pattern = 'edit'
     }
-     this.getUnitData()
+      this.getUnitData()
      this.getOrganizations()
     if(this.route.snapshot.queryParams.xiazai=='true'){
       window.setTimeout(()=>{
         this.generatingDoc()
-      },3500)
+      },5000)
       
     }
   }
@@ -169,7 +169,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
 
   //获得单位信息
   unitData: any
-  getUnitData() {
+  async getUnitData() {
     let paramsdata: any = {
       Name: this.route.snapshot.queryParams.unitName || '',
     }
@@ -1677,11 +1677,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     
     this.planTemplateData.forEach(element => {
       if(element.groupName=='交通水源'||element.groupName=='重点图示'){
-        for(let i=0;i<element.attribute[0].imgArr.length;i++){
-          console.log(element.attribute[0].imgArr[i])
-          element.attribute[0].imgArr[i]= String(element.attribute[0].imgArr[i]) +'?x-image-process=image/format,jpg'
+        if(element.attribute[0].imgArr.length>0){
+          for(let i=0;i<element.attribute[0].imgArr.length;i++){
+            console.log(element.attribute[0].imgArr[i])
+            element.attribute[0].imgArr[i]= String(element.attribute[0].imgArr[i]) +'?x-image-process=image/format,jpg'
+          }
         }
-        
       }
     });
     console.log(this.planTemplateData)
@@ -2160,9 +2161,9 @@ export class disaster{
     }else if(this.headName==undefined||this.headName==''){
       this.snackBar.open('请输入表头名称!','确定',config);
     }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
-      this.snackBar.open('请输入列数,并且列数大于0!','确定',config);
+      this.snackBar.open('列数不许为空,并且列数大于0!','确定',config);
     }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
-      this.snackBar.open('请输入行数,并且行数大于0!!','确定',config);
+      this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config);
     }
     else{
       let tree={
@@ -2230,9 +2231,9 @@ export class updataHl{
     }else if(this.headName==undefined||this.headName==''){
       this.snackBar.open('请输入表头名称!','确定',config);
     }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
-      this.snackBar.open('请输入列数,并且列数大于一!','确定',config);
+      this.snackBar.open('列数不许为空,并且列数大于0!','确定',config);
     }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
-      this.snackBar.open('请输入行数,并且行数大于一!!','确定',config);
+      this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config);
     }else{
       this.dialogRef.close(result);
     }
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 ec0b7bd..446a9d9 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
@@ -643,8 +643,9 @@ export class EntryPlanLookComponent implements OnInit {
     console.log(element)
     if(element.planType==16&&(element.planMode==4||element.planMode==2)){
       const dialogRef = this.dialog.open(wenbenUpload, {
-        width: "650px",
-        height:"710px",
+        width: "180px",
+        height:"200px",
+        disableClose: true,
         data: {src:`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`}
       });
       //window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`)
@@ -1879,7 +1880,7 @@ export class wenbenUpload{
     console.log(this.data)
     window.setTimeout(()=>{
       this.dialogRef.close();
-    },5000)
+    },7000)
   }
   src=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.src);
 }
diff --git a/src/app/plan-management/entry-plan-look/upNew.html b/src/app/plan-management/entry-plan-look/upNew.html
index e3faec1..862adaa 100644
--- a/src/app/plan-management/entry-plan-look/upNew.html
+++ b/src/app/plan-management/entry-plan-look/upNew.html
@@ -1,3 +1,5 @@
-<div style="height: 100%;width: 100%;">
-    <iframe [src]="src" style="width: 100%;height: 100%;"></iframe>
+<div style="height: 100%;width: 100%;text-align: center;">
+    <iframe [src]="src" style="width: 100%;height: 100%;display: none;"></iframe>
+    <span style="text-align: center;font-size: 16px;color: black;font-weight: bold;">下载中</span>
+    <mat-spinner style="margin-left: 10px;margin-top: 10px;"></mat-spinner>
 </div>
\ No newline at end of file