From 5a9ef6e53140e285dd43134f6e353fac425724b3 Mon Sep 17 00:00:00 2001
From: chenjingyu <1148019379@qq.com>
Date: Mon, 13 Dec 2021 16:06:06 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E4=BA=94=E7=BA=A7=E5=86=9C?=
 =?UTF-8?q?=E6=9D=91=E6=A8=A1=E6=9D=BF=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-plan-online-five.component.ts          | 15 +++++++--------
 .../scheduled-updates.component.html              | 11 +++++++++--
 2 files changed, 16 insertions(+), 10 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 c1ab71a..4ace18d 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
@@ -165,12 +165,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       data.items.forEach(element => {
         if (element.id == this.route.snapshot.queryParams.companyId) {
           this.unitData = element
-          if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民小区'||this.unitData.buildingTypes[0].name=='厂房'
-          ||this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校'
-          ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业'
-          ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院'
-          ||this.unitData.buildingTypes[0].name=='会议中心'||this.unitData.buildingTypes[0].name=='储罐类'||this.unitData.buildingTypes[0].name=='化工生产'
-          ||this.unitData.buildingTypes[0].name=='轨道交通'||this.unitData.buildingTypes[0].name=='地下建筑')&&this.planLevel=='5'){
+          if(this.planLevel=='5'){
             this.zaixianDr=true
           }
           //console.log('单位列表信息', this.unitData)
@@ -1792,7 +1787,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业'
     ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院'
     ||this.unitData.buildingTypes[0].name=='会议中心')?4:this.unitData.buildingTypes[0].name=='储罐类'?'StorageTankFivePlan':
-    this.unitData.buildingTypes[0].name=='化工生产'?'ChemicalProductionFivePlan':this.unitData.buildingTypes[0].name=='轨道交通'?'MetroFivePlan':this.unitData.buildingTypes[0].name=='地下建筑'?'UndergroundBuildingFivePlan':''
+    this.unitData.buildingTypes[0].name=='化工生产'?'ChemicalProductionFivePlan':this.unitData.buildingTypes[0].name=='轨道交通'?'MetroFivePlan':
+    this.unitData.buildingTypes[0].name=='地下建筑'?'UndergroundBuildingFivePlan':this.unitData.buildingTypes[0].name=='农村'?'CountrysideFivePlan':''
     
     this.http.post(`/api/OfficeExtract/ExtractWordPlan?type=${type}`,formData).subscribe((data:any)=>{
       console.log(data)
@@ -1803,7 +1799,10 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
         this.fileData.forEach((value,index,array) => {
           if(value.groupName=='交通水源'||value.groupName=='重点图示'){
             value.attribute.forEach(element => {
-              element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length)
+              if(element.imgArr!=undefined){
+                element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length)
+              }
+              
             });
           }
           this.planTemplateData.forEach((pvalue,pindex,parr) => {
diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
index dec496c..bbda33a 100644
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
@@ -31,9 +31,16 @@
   <app-indexCondition *ngIf="selectedBtn=='tiaojian'"></app-indexCondition>
   <div class="echartsbox" >
       <div id="pie">
-      
       </div>
-      <div id="pieTwo"></div>
+      <span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
+        <mat-icon >autorenew</mat-icon>
+    </span>
+      <div id="pieTwo">
+        
+      </div>
+      <span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
+        <mat-icon >autorenew</mat-icon>
+    </span>
   </div>
   
 </div>
\ No newline at end of file