diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index ac9f958..4e4daa8 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -361,7 +361,7 @@ export class KeyUnitManagementComponent implements OnInit {
data.items.forEach( (item,index) => {
item.integrity = this.wanzhengduArr[index]
})
- console.log(789,data.items)
+ //console.log(789,data.items)
this.tabledataSource = new MatTableDataSource(data.items);
})
}
@@ -669,7 +669,7 @@ export class KeyUnitManagementComponent implements OnInit {
}
//提交审核
submitAudit(element){
- console.log(element)
+ //console.log(element)
let body:any = {
title:element.name,
Operation:0,
@@ -679,21 +679,24 @@ export class KeyUnitManagementComponent implements OnInit {
}
this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
this.getAllKeyUnit()
+ },err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open(err,'确定',config);
})
}
//撤销审核
cancelAudit(element){
- let body:any = {
- //title:element.name,
- //Operation:0,
- id:element.contentVerify.id,
- itemId:element.id,
- verifyState:-1,
- contentType:11
- }
this.http.delete(`/api/ContentVerifies/${element.contentVerify.id}`).subscribe(data=>{
this.getAllKeyUnit()
+ },
+ err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open(err,'确定',config);
})
}
//审核结果
@@ -748,7 +751,6 @@ export class CreateUnit {
this.jsId = node.id
}
onSubmit(value){
- // console.log(value)
let myDate = new Date();
let body = {
id: "",
diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html
index edae64d..460b2d5 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.html
+++ b/src/app/plan-audit/plan-record/plan-record.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-03 13:54:44
+ * @LastEditTime: 2021-03-05 14:49:01
-->
@@ -88,7 +88,8 @@
类型 |
- 操作 |
+ 名称 |
+ 操作 |
所属组织 |
审核状态 |
提交人 |
@@ -102,7 +103,8 @@
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
'Ⅴ级预案':item.contentType=='6'?'应急预案(国家级)':item.contentType=='7'?'应急预案(市级)':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}}
- {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} |
+ {{item.title}} |
+ {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} |
{{item.verifyOrganizationName}} |
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} |
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index fbfe6c5..4000dcb 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -45,7 +45,8 @@
类型 |
- 操作 |
+ 名称 |
+ 操作 |
所属组织 |
审核状态 |
提交人 |
@@ -59,7 +60,8 @@
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
'Ⅴ级预案':item.contentType=='6'?'应急预案(国家级)':item.contentType=='7'?'应急预案(市级)':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
- {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} |
+ {{item.title}} |
+ {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} |
{{item.verifyOrganizationName}} |
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} |
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
index ab4927a..a671f8b 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
@@ -244,16 +244,17 @@ export class EntryPlanLookComponent implements OnInit {
}
//删除预案
deletePlan(plandata){
-
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
let isTrue = confirm('您确定要删除吗')
if (isTrue) {
if(plandata.planType == 1){//如果删除的是二维预案
this.http.delete(`/api/PlanComponents2D/${plandata.id}`).subscribe(data=>{
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
this.snackBar.open('删除成功!','确定',config);
this.getAllPlanComponents()
+ },err => {
+ this.snackBar.open(err,'确定',config);
})
}else{
this.http.delete(`/api/PlanComponents/${plandata.id}`).subscribe(data=>{
@@ -262,6 +263,8 @@ export class EntryPlanLookComponent implements OnInit {
config.duration = 3000
this.snackBar.open('删除成功!','确定',config);
this.getAllPlanComponents()
+ },err => {
+ this.snackBar.open(err,'确定',config);
})
}
}