[修改]五级农村预案上传问题

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -679,17 +679,17 @@
                                 border: 0;
                                 box-sizing: border-box;
                                 padding: 0 5px;"> {{ i.name }} </div>
-                                <mat-icon class="deleteItem" *ngIf="key != 0 && pattern == 'edit'"
+                                <img src="../../../assets/images/deletered.png" class="deleteItem" *ngIf="key != 0 && pattern == 'edit'"
-                                    (click)="deleteItem(item,key)">delete
+                                    (click)="deleteItem(item,key)" />
-                                </mat-icon>
+                                
                             </div>
                             <div class="keyImgImg">
                                 <div style="margin-top: 10px;
                                 text-align: center;
                                 position: relative;" class="imgbox" *ngFor="let imgUrl of i.imgArr;let imgkey = index">
-                                    <mat-icon *ngIf="pattern == 'edit'" class="deleteImg"
+                                    <img src="../../../assets/images/deletered.png" *ngIf="pattern == 'edit'" class="deleteImg"
-                                        (click)="deleteImgItem(i.imgArr,imgkey)">delete
+                                        (click)="deleteImgItem(i.imgArr,imgkey)"/>
-                                    </mat-icon>
+                                    
                                     <img style="max-width: 100%;
                                     width: auto;
                                     height: auto;" [src]="imgUrl" alt="">

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -1799,7 +1799,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
         this.fileData.forEach((value,index,array) => {
           if(value.groupName=='交通水源'||value.groupName=='重点图示'){
             value.attribute.forEach(element => {
-              if(element.imgArr!=undefined){
+              if(element.imgArr!=undefined&&element.imgArr.length>0){
                 element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length)
               }
               

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -614,7 +614,8 @@ export class EntryPlanLookComponent implements OnInit {
     :(this.unitdata.unittype=='商市场'||this.unitdata.unittype=='医院'||this.unitdata.unittype=='学校'
     ||this.unitdata.unittype=='宾馆'||this.unitdata.unittype=='娱乐场所'||this.unitdata.unittype=='餐饮业'
     ||this.unitdata.unittype=='影剧院'||this.unitdata.unittype=='展览建筑'||this.unitdata.unittype=='养老院'
-    ||this.unitdata.unittype=='会议中心')?4:this.unitdata.unittype=='储罐类'?'StorageTankFivePlan':this.unitdata.unittype=='化工生产'?'ChemicalProductionFivePlan':''
+    ||this.unitdata.unittype=='会议中心')?4:this.unitdata.unittype=='储罐类'?'StorageTankFivePlan'
+    :this.unitdata.unittype=='化工生产'?'ChemicalProductionFivePlan':this.unitdata.unittype=='农村'?'CountrysideFivePlan':''
     let blob=[]
     /* 
     调用下载接口获取文件流,并赋值给blob

src/app/tabbar/tabbar.component.html

@@ -214,15 +214,15 @@
     </div>
     
     <div class="isUpdates" *ngIf="isUpdates">
-        <span class="name" (click)="submitAudit()"
+        <!-- <span class="name" (click)="submitAudit()"
             *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>
-        <span class="name" (click)="cancelAudit()" *ngIf="contentVerify && contentVerify.verifyState == 3">撤销审核</span>
+        <span class="name" (click)="cancelAudit()" *ngIf="contentVerify && contentVerify.verifyState == 3">撤销审核</span> -->
 
-        <span class="span" *ngIf="contentVerify && contentVerify.verifyState == 3">(
+        <!-- <span class="span" *ngIf="contentVerify && contentVerify.verifyState == 3">(
             <span *ngIf="contentVerify.operation == 2" style="color: red;">删除</span>
             <span *ngIf="contentVerify.operation == 0">新增</span>
             <span *ngIf="contentVerify.operation == 1">更新</span>
-            待审核)</span>
+            待审核)</span> -->
         <span [matTooltip]="contentVerify.remark" class="span"
             *ngIf="contentVerify && contentVerify.verifyState == 4">(审核通过)</span>
         <span [matTooltip]="contentVerify.remark" class="span"

src/app/tabbar/tabbar.component.ts

@@ -104,35 +104,43 @@ export class TabbarComponent implements OnInit {
   }
   //提交单位审核
   submitAudit(){
-    let body:any = {
+    let isTrue = confirm('您确定要审核该条信息吗')
-      title : sessionStorage.getItem('companyName'),
+    if(isTrue){
-      Operation : sessionStorage.getItem('contentVerify') ? 1 : 0,
+      let body:any = {
-      itemId : sessionStorage.getItem('companyId'),
+        title : sessionStorage.getItem('companyName'),
-      verifyState : 3,
+        Operation : sessionStorage.getItem('contentVerify') ? 1 : 0,
-      contentType : 11
+        itemId : sessionStorage.getItem('companyId'),
+        verifyState : 3,
+        contentType : 11
+      }
+      this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
+        this.contentVerify = data
+        sessionStorage.setItem('contentVerify',JSON.stringify(data))
+        },err=>{
+          const config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open(err,'确定',config);
+      })
     }
-    this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
+    
-      this.contentVerify = data
+  }
-      sessionStorage.setItem('contentVerify',JSON.stringify(data))
+  //撤销单位审核
-      },err=>{
+  cancelAudit(){
+    let isTrue = confirm('您确定要撤销审核该条信息吗')
+    if(isTrue){
+      this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data=>{
+        this.contentVerify = data
+        sessionStorage.setItem('contentVerify',JSON.stringify(data))
+      },
+      err=>{
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open(err,'确定',config);
-    })
+      })
-  }
+    }
-  //撤销单位审核
+    
-  cancelAudit(){
-    this.http.delete(`/api/ContentVerifies/${this.contentVerify.id}`).subscribe(data=>{
-      this.contentVerify = data
-      sessionStorage.setItem('contentVerify',JSON.stringify(data))
-    },
-    err=>{
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open(err,'确定',config);
-    })
   }
   //初始化下载
   downloadFile () {