[完善]单位待审核去掉平面图保存键

src/app/gis-management/plan-list/plan-list.component.scss

@@ -21,11 +21,13 @@
     padding: 20px;
     display: flex;
     flex-wrap: wrap;
-    justify-content: space-between;
+    justify-content: flex-start;
     .contantitem{
+        margin-right: 6px;
         div{
             width: 110px;
             height: 110px;
+            
             img{
                 width: 100%;
                 height: 100%;

src/app/plan-audit/plan-list/plan-list.component.ts

@@ -71,7 +71,7 @@ export class PlanListComponent implements OnInit {
 export class OpenPlanToolDialog {
 
   constructor(public http: HttpClient,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<OpenPlanToolDialog>,
-    @Inject(MAT_DIALOG_DATA) public data,private render2: Renderer2,public dialog: MatDialog) {}
+  @Inject(MAT_DIALOG_DATA) public data,private render2: Renderer2,public dialog: MatDialog) {}
 
   @ViewChild( 'plan',{static: false} ) plan:any //子组件
   

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -344,98 +344,97 @@ export class WaitExamineerComponent implements OnInit {
     var agreeList=[]
     var companyAgreeList=[]
     const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      console.log(this.shenheTable)
-      if(this.shenheTable.length==0){
-        this.snackBar.open('请勾选要审核的条目!','确定',config);
-      }
-      //单个审核
-      else if(this.shenheTable.length == 1){
-        let isTrue = window.confirm('确定同意选中条目的审核吗？')
-        if(isTrue){
-          //重点单位审核
-          if(this.shenheTable[0].contentType == 11){
-            let body:any = {
-              id:this.shenheTable[0].id,
-              itemId:this.shenheTable[0].itemId,
-              verifyState:4,
-              contentType:11,
-              title:this.shenheTable[0].title+'基本信息'
-            }
-            this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    console.log(this.shenheTable)
+    if(this.shenheTable.length==0){
+      this.snackBar.open('请勾选要审核的条目!','确定',config);
+    }
+    //单个审核
+    else if(this.shenheTable.length == 1){
+      let isTrue = window.confirm('确定同意选中条目的审核吗？')
+      if(isTrue){
+        //重点单位审核
+        if(this.shenheTable[0].contentType == 11){
+          let body:any = {
+            id:this.shenheTable[0].id,
+            itemId:this.shenheTable[0].itemId,
+            verifyState:4,
+            contentType:11,
+            title:this.shenheTable[0].title+'基本信息'
+          }
+          this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
+          console.log(1111,this.shenheTable[0])
+          let body:any = {
+            id:this.shenheTable[0].id,
+            itemId:this.shenheTable[0].itemId,
+            verifyState:4,
+            contentType:this.shenheTable[0].contentType,
+            title:this.shenheTable[0].title
+          }
+          this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.showtype = -1
+            this.getAlltabledate()
+          })
+        }else{
+          //预案审核
+          if(this.shenheTable[0].verifyState==0){
+            this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
               this.snackBar.open('操作成功!','确定',config);
               this.getAlltabledate()
             })
-          }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
-            console.log(1111,this.shenheTable[0])
-            let body:any = {
-              id:this.shenheTable[0].id,
-              itemId:this.shenheTable[0].itemId,
-              verifyState:4,
-              contentType:this.shenheTable[0].contentType,
-              title:this.shenheTable[0].title
-            }
-            this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+          }else if(this.shenheTable[0].verifyState==3){
+            this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
               this.snackBar.open('操作成功!','确定',config);
-              this.showtype = -1
               this.getAlltabledate()
             })
-          }else{
-            //预案审核
-            if(this.shenheTable[0].verifyState==0){
-              this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
-                this.snackBar.open('操作成功!','确定',config);
-                this.getAlltabledate()
-              })
-            }else if(this.shenheTable[0].verifyState==3){
-              this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
-                this.snackBar.open('操作成功!','确定',config);
-                this.getAlltabledate()
-              })
-            }
           }
-          this.shenheTable=[]
         }
-        
+        this.shenheTable=[]
       }
-      //批量审核
-      else{
-        let isTrue = window.confirm('确定同意选中条目的审核吗？')
-        if(isTrue){
-          if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){   //批量审批水源和重点单位
-            for(var i=0;i<this.shenheTable.length;i++){
-              var body={
-                id:this.shenheTable[i].id,
-                itemId:this.shenheTable[i].itemId,
-                verifyState:4
-              }
-              companyAgreeList.push(body)
+      
+    }
+    //批量审核
+    else{
+      let isTrue = window.confirm('确定同意选中条目的审核吗？')
+      if(isTrue){
+        if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){   //批量审批水源和重点单位
+          for(var i=0;i<this.shenheTable.length;i++){
+            var body={
+              id:this.shenheTable[i].id,
+              itemId:this.shenheTable[i].itemId,
+              verifyState:4
             }
-            this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
-              this.snackBar.open('操作成功!','确定',config);
-              this.getAlltabledate()
-            })
-          }else{   //批量审核预案
-            for(var i=0;i<this.shenheTable.length;i++){
-              var cart={
-                planComponentId:this.shenheTable[i].itemId,
-                auditStatus:this.shenheTable[i].verifyState==3?2:16,
-                auditOpinion:''
-              }
-              agreeList.push(cart)
+            companyAgreeList.push(body)
+          }
+          this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }else{   //批量审核预案
+          for(var i=0;i<this.shenheTable.length;i++){
+            var cart={
+              planComponentId:this.shenheTable[i].itemId,
+              auditStatus:this.shenheTable[i].verifyState==3?2:16,
+              auditOpinion:''
             }
-            this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
-              this.snackBar.open('操作成功!','确定',config);
-              this.getAlltabledate()
-            })
+            agreeList.push(cart)
           }
-          this.shenheTable=[]
+          this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
         }
-        
+        this.shenheTable=[]
       }
       
- }
+    } 
+  }
   //拒绝操作
   refuse(){
     const config = new MatSnackBarConfig();

src/app/ui/collection-tools-plan/collection-tools.component.ts

@@ -687,7 +687,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     }
 
     //gis模块平面图
-    if(this.router.url.indexOf("gis") != -1 && sessionStorage.getItem("gisplan") == "look"){
+    if((this.router.url.indexOf("gis") != -1 || this.router.url.indexOf("waitexamineer") != -1) && sessionStorage.getItem("gisplan") == "look"){
       this.isEditPattern = false
       this.isediticon = false
       this.canvasData.gameMode = GameMode.Assignment