shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

zhuzhou
chenjingyu 4 years ago
parent
6796b8332c a716853d91
commit
2b0a3a8476
4 changed files with 81 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/gis-management/plan-list/plan-list.component.scss
  2. 2
      src/app/plan-audit/plan-list/plan-list.component.ts
  3. 153
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  4. 2
      src/app/ui/collection-tools-plan/collection-tools.component.ts

4
src/app/gis-management/plan-list/plan-list.component.scss
Unescape View File

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

2
src/app/plan-audit/plan-list/plan-list.component.ts
Unescape View File

@ -71,7 +71,7 @@ export class PlanListComponent implements OnInit {
export class OpenPlanToolDialog { export class OpenPlanToolDialog {
constructor(public http: HttpClient,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<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 //子组件 @ViewChild( 'plan',{static: false} ) plan:any //子组件

153
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

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

2
src/app/ui/collection-tools-plan/collection-tools.component.ts
Unescape View File

@ -687,7 +687,7 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
//gis模块平面图 //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.isEditPattern = false
this.isediticon = false this.isediticon = false
this.canvasData.gameMode = GameMode.Assignment this.canvasData.gameMode = GameMode.Assignment

Write Preview
Loading…
Cancel
Save