diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss b/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
index 01a9116..e411244 100644
--- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
+++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
@@ -14,4 +14,4 @@
z-index: 111;
color: red;
}
-}
\ No newline at end of file
+}
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index 3e66280..7ea9790 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -95,7 +95,7 @@
-
+
@@ -104,7 +104,7 @@
|
-
+
|
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 e0659d1..9c54d9d 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
@@ -349,6 +349,7 @@ export class KeyUnitManagementComponent implements OnInit {
PageSize: this.pageSizeOptions[0],
Sort: this.integritySort ? 'integrityscore' : '',
SortType: this.integritySort || '',
+ IsNewData:true,
IntegrityScoreMin:this.integrityScoreMin/100||0,
IntegrityScoreMax:this.integrityScoreMax/100||1
}
@@ -430,16 +431,30 @@ export class KeyUnitManagementComponent implements OnInit {
//勾选框事件
verifyState //判断是否可以修改
checkChange(e,element){
+ console.log(e)
console.log(element)
if(element.contentVerify!=null){
this.verifyState=element.contentVerify.verifyState
+
}else{
this.verifyState=null
}
+ if(e.checked){
+ //this.deleteArr=element
+ this.deleteAll.push(element)
+ }else{
+ for(var i=0;i{
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('删除成功','确定',config);
- this.getAllKeyUnit();
- })
+ let body:any = {
+ title:this.deleteAll[0].name,
+ Operation:2,
+ itemId:this.deleteAll[0].id,
+ verifyState:3,
+ contentType:11
+ }
+ this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
+ this.snackBar.open('操作成功','确定',config);
+ this.getAllKeyUnit()
+ },err=>{
+ this.snackBar.open(err,'确定',config);
+ })
}
+ }else if(this.deleteAll.length > 1){
+ let isTrue = confirm('您确定要提交删除审核吗')
+ if(isTrue){
+ for(var i=0;i{
+ this.snackBar.open('操作成功','确定',config);
+ this.getAllKeyUnit()
+ },err=>{
+ this.snackBar.open(err,'确定',config);
+ })
+ }
}
}
@@ -844,7 +890,7 @@ export class companyAuditResult{
createTime=''
organizationName=this.data.element.organizationName
verifyTime=''
- remark=this.data.element.contentVerify.remark
+ remark=''
verifyOrganizationName
verifyState=100
ngOnInit(): void {
@@ -855,6 +901,7 @@ export class companyAuditResult{
//this.remark=this.data.element.remark
this.verifyState=this.data.element.contentVerify.verifyState
this.verifyOrganizationName=this.data.element.contentVerify.verifyOrganizationName
+ this.remark=this.data.element.contentVerify.remark
}
}
onNoClick(): void {
diff --git a/src/app/pipes/boolean.pipe.ts b/src/app/pipes/boolean.pipe.ts
index 56b7930..78ae821 100644
--- a/src/app/pipes/boolean.pipe.ts
+++ b/src/app/pipes/boolean.pipe.ts
@@ -29,4 +29,19 @@ export class PlanLevel implements PipeTransform {
transform(value: number): string {
return PlanLevelEnum[value]
}
+}
+
+@Pipe({name: 'state'})
+export class state implements PipeTransform {
+ transform(value: number): string {
+ if(value == 3){
+ return '维护中'
+ }else if(value == 4){
+ return '维护通过审核'
+ }else if(value == 5){
+ return '维护驳回审核'
+ }else{
+ return '未维护'
+ }
+ }
}
\ No newline at end of file
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.html b/src/app/plan-management/maintain-up/maintain-up.component.html
index b31cff8..d07abdd 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.html
+++ b/src/app/plan-management/maintain-up/maintain-up.component.html
@@ -1,88 +1,68 @@
-
- '
@@ -526,7 +525,7 @@ export class EchartsDataService {
})
}
this.localData=localStorage.getItem('yuansuccesstishi')
- }else{
+ }else if(datas.name='预案编制'){
this.localData=''
if(localStorage.getItem('yuanbiantishi')==undefined){
this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts
index 422b4e1..cb01654 100644
--- a/src/app/statistic-analysis/state/page-one/page-one.component.ts
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-01 15:24:39
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-17 10:30:24
+ * @LastEditTime: 2021-03-19 14:06:41
*/
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
@@ -116,7 +116,7 @@ export class PageOneComponent implements OnInit {
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]);
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt);
let identityJsonparse=JSON.parse(identityJson) */
- if(this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2'){
+ if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.echartsData.localData.length>0){
window.setTimeout(()=>{
this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':params.name,'type':params.data.type}});
})
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index da4abdf..738ad11 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -186,7 +186,20 @@
+ 提交审核
+ 撤销审核
+ (
+ 删除
+ 新增
+ 更新
+ 待审核)
+ (审核通过)
+ (审核驳回)
+
+
+
帮助文档下载中,请等待...
diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss
index 7e70f6e..099f600 100644
--- a/src/app/tabbar/tabbar.component.scss
+++ b/src/app/tabbar/tabbar.component.scss
@@ -176,7 +176,7 @@ mat-icon{
}
}
//计分规则按钮
-.scoringRule{
+.scoringRule,.isUpdates{
user-select: none;
position: absolute;
left: 480px;
@@ -194,6 +194,10 @@ mat-icon{
margin: 0;
padding: 0;
}
+ .span{
+ font-size: 18px;
+ margin-left: 12px;
+ }
.scoringRuleImg{
z-index: 999;
position: absolute;
@@ -251,6 +255,9 @@ mat-icon{
}
}
+.isUpdates{
+ left: 596px;
+}
.uploadFile{
height: 64px;
line-height: 64px;
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index 436254b..5cf429d 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -37,7 +37,9 @@ export class TabbarComponent implements OnInit {
integrityData:any
- companyIntegrityScore:any
+ companyIntegrityScore:any//是否显示单位分数
+ isUpdates:any //是否显示单位提交审核 撤销审核等按钮
+ contentVerify:any//当前单位的审核状态信息
ngOnInit() {
this.routerEventsListener = this.router.events.pipe(
@@ -46,6 +48,7 @@ export class TabbarComponent implements OnInit {
this.title = "数字化预案编制管理平台"
this.planName = null
this.grade = null
+ this.isUpdates = null
if(this.router.url.indexOf("editunitinfo") == -1 || this.router.url.indexOf("viewunitinfoplan") == -1){//如果url地址是从录入预案跳转
this.companyIntegrityScore = ''
}
@@ -57,9 +60,13 @@ export class TabbarComponent implements OnInit {
}
if(this.router.url.indexOf("editplaninfo") != -1 || (this.router.url.indexOf("viewunitinfo") != -1 && this.router.url.indexOf("viewunitinfoplan") == -1)){//如果url地址是从重点单位跳转
this.title = sessionStorage.getItem("companyName")
- // let obj = JSON.parse(sessionStorage.getItem(this.route.snapshot.queryParams.id))
- // this.companyIntegrityScore = obj
this.getIntegrityScore()
+ //从维护更新页面进入需要显示提交审核按钮
+ if(this.route.snapshot.queryParams["isUpdates"] == '1'){
+ this.contentVerify = JSON.parse(sessionStorage.getItem('contentVerify'))
+ console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify')))
+ this.isUpdates = true
+ }
this.tabbarService.getMessage().subscribe((message: any)=>{
this.getIntegrityScore()
});
@@ -97,7 +104,38 @@ export class TabbarComponent implements OnInit {
this.snackBar.open('下载失败','确定',config);
})
}
-
+ //提交单位审核
+ submitAudit(){
+ let body:any = {
+ title : sessionStorage.getItem('companyName'),
+ Operation : sessionStorage.getItem('contentVerify') ? 1 : 0,
+ 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);
+ })
+ }
+ //撤销单位审核
+ 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 () {
let file = this.download