From eca726a97f99bf1a9a4b58057bf995c0a8ab0bce Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 15 Mar 2021 15:55:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=8D=95=E4=BD=8D=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=BB=E6=8E=89=E5=B9=B3=E9=9D=A2=E5=9B=BE?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-list/plan-list.component.scss | 4 +- .../plan-list/plan-list.component.ts | 2 +- .../wait-examineer.component.ts | 153 +++++++++--------- .../collection-tools.component.ts | 2 +- 4 files changed, 81 insertions(+), 80 deletions(-) diff --git a/src/app/gis-management/plan-list/plan-list.component.scss b/src/app/gis-management/plan-list/plan-list.component.scss index a1939e9..b346dcf 100644 --- a/src/app/gis-management/plan-list/plan-list.component.scss +++ b/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%; diff --git a/src/app/plan-audit/plan-list/plan-list.component.ts b/src/app/plan-audit/plan-list/plan-list.component.ts index 8dc7ae8..214e9c7 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.ts +++ b/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, - @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 //子组件 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 70a6a62..8dbbdd3 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/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.snackBar.open('操作成功!','确定',config); - this.getAlltabledate() - }) - }else{ //批量审核预案 - for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else{ //批量审核预案 + for(var i=0;i{ - 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(); diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index c75df3a..83b8cf8 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/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