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 2408e26..c46b9b0 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 @@ -111,6 +111,12 @@ autocomplete="off"> +
+ + + + +
@@ -146,6 +152,13 @@ + + 预案状态 + + 新增 + 维护更新 + + 单位名称 diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss index b76bbeb..76e3338 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss @@ -92,6 +92,25 @@ } } .tablebox{ + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; margin-top: 15px; 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 5ea3df9..24a609a 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 @@ -67,7 +67,7 @@ export class KeyUnitManagementComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any //第几页 - displayedColumns: string[] = ['checked','Follow','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation']; + displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation']; tabledataSource:any allorganizations:any oldDataSource:any; //原始表格数据 @@ -354,6 +354,7 @@ export class KeyUnitManagementComponent implements OnInit { ] allKeyUnitInfo:any //所有的重点单位 + IsNewData=true//是否是新增或者维护更新 getAllKeyUnit(){ // console.log(Boolean(Number(this.follow))) let follow @@ -378,7 +379,7 @@ export class KeyUnitManagementComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', - IsNewData:true, + IsNewData:this.IsNewData, IntegrityScoreMin:this.integrityScoreMin/100||0, IntegrityScoreMax:this.integrityScoreMax/100||1 } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index aad55ac..f38a9b6 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -43,6 +43,13 @@
+ + + + diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss index 8cd793d..789d27e 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss @@ -25,6 +25,25 @@ } .tablebox{ overflow: auto; + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; margin-left: 0%; 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 2727df6..f2cc0e7 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 @@ -39,8 +39,8 @@ export class EntryPlanLookComponent implements OnInit { dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; - - displayedColumns: string[] = ['planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; + IsNewData=true //维护更新活新增 + displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; tabledataSource: any //分页 @ViewChild(MatPaginator, { static: true }) diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html index a708170..76e1b0f 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -125,6 +125,12 @@ +
+ + + + +
@@ -133,6 +139,13 @@
预案状态 + 新增 + 维护更新 + 预案名称 {{element.name}}
+ + + + diff --git a/src/app/plan-management/entry-plan/entry-plan.component.scss b/src/app/plan-management/entry-plan/entry-plan.component.scss index 40b974d..3be6ee6 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.scss +++ b/src/app/plan-management/entry-plan/entry-plan.component.scss @@ -100,6 +100,25 @@ } } .tablebox{ + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; margin-left: 0%; diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index 7f8fcf8..928646d 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -42,10 +42,10 @@ export class EntryPlanComponent implements OnInit { pageSize:any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 + IsNewData=true //维护更新活新增 - - displayedColumns: string[] = ['unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; + displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 @@ -333,7 +333,8 @@ export class EntryPlanComponent implements OnInit { Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', HasPlanComponents:this.haveyuan||'', - PlanCategories:this.planCategory + PlanCategories:this.planCategory, + IsNewData:this.IsNewData, } this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{ diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html index c8116d3..2f9d61f 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -84,6 +84,12 @@ +
+ + + + +
+ + + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss index 6b834aa..4672320 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -95,6 +95,25 @@ } } .tablebox{ + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; // margin-left: 2%; diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 973f521..0d767d5 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -44,10 +44,11 @@ export class PassPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber: any; //第几页 - displayedColumns: string[] = ['planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation']; + displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation']; allorganizations: any //所有组织机构 allunittype: any //所有单位类型 tabledataSource: any //表格数据 + IsNewData=true //维护更新活新增 url preparelevels: any @@ -136,7 +137,8 @@ export class PassPlanComponent implements OnInit { PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], Sort: '', - PlanCategories: this.planCategory + PlanCategories: this.planCategory, + IsNewData:this.IsNewData, } this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => { this.length = data.totalCount diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html index f95a6c0..3a0dc1b 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -78,14 +78,19 @@ - - - - -
+
+ + + + +
+
+ +
+ @@ -93,6 +98,13 @@
预案状态 + 新增 + 维护更新 + 单位名称 {{element.company.name}} 预案状态 + 新增 + 维护更新 + 预案名称 {{element.name}}
+ + + + diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss index cf61363..30d199d 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss @@ -90,6 +90,25 @@ } } .tablebox{ + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; // margin-left: 2%; diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index 3256776..75cb817 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts @@ -44,10 +44,11 @@ export class ReinforcePlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - displayedColumns: string[] = ['unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; + displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 + IsNewData=true //维护更新活新增 preparelevels:any ngOnInit(): void { @@ -127,7 +128,8 @@ export class ReinforcePlanComponent implements OnInit { CreationTimeRangeEnd:this.endtime||'', PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], - Sort: '' + Sort: '', + IsNewData:this.IsNewData, } this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ // console.log('增援预案列表',data) diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html index ab79d23..dbc2bd4 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -66,7 +66,12 @@ - +
+ + + + +
@@ -89,6 +94,13 @@
预案状态 + 新增 + 维护更新 + 单位名称 {{element.companyName}}
+ + + + diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index 81b800b..42f8719 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -111,6 +111,25 @@ } } .tablebox{ + .add{ + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 40px; + } + .weihu{ + //display: block; + width: 64px; + height: 20px; + background: #2196F3; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + } table{ width: 100%; margin-left: 0%; diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 6eb1bb3..9408be0 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -89,7 +89,8 @@ export class TypePlanComponent implements OnInit { levels preparelevels: any plcheck: boolean //编制级别勾选框 - displayedColumns: string[] = ['unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; + IsNewData=true //维护更新活新增 + displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; tabledataSource unitname//预案名称 level//预案级别 @@ -121,7 +122,7 @@ export class TypePlanComponent implements OnInit { HasChildrenPlanLevel: this.plcheck || '', PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], - + IsNewData:this.IsNewData, } this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => { this.length = data.totalCount diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html index bbda33a..8c1f6ae 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html @@ -32,15 +32,17 @@
- + + +
- +
\ No newline at end of file diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss index c6c873c..6991a6b 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss @@ -75,6 +75,10 @@ flex-direction: row; margin-top: 80px; //justify-content:center; + button{ + width: 88px; + height: 36px; + } } #pie{ width: 50%; diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts index 15400d5..1f91a78 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -18,8 +18,8 @@ export class ScheduledUpdatesComponent implements OnInit { ngOnInit(): void { window.setTimeout(()=>{ - this.initCharts("pie") - this.initCharts("pieTwo") + this.getechartsdata() + }) } @@ -52,13 +52,25 @@ export class ScheduledUpdatesComponent implements OnInit { this.echartsData.buildingName=this.chaxun this.echartsData.tableShow=true } + } + async getechartsdata(){ + await this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies/Maintained`) + this.tabledata1=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata1) + this.initCharts("pie") + await this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies/Maintaining`) + this.tabledata2=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata2) + this.initCharts("pieTwo") } /* 首页饼状图 */ + tabledata1 + tabledata2 initCharts(pieid){ this.example= echarts.init(document.getElementById(pieid),'walden'); var options={ title: { - text: pieid=="pie"?'已维护统计（0家）':'计划维护统计（0家）', + text: pieid=="pie"?`已维护统计（${this.tabledata1[0].totalCount}家）`:`计划维护统计（${this.tabledata2[0].totalCount}家）`, top: "3%", left: 'center', textStyle:{ @@ -103,13 +115,13 @@ export class ScheduledUpdatesComponent implements OnInit { }, }}, data:pieid=="pie"? [ - {value: 0, name: '维护无需修改'}, - {value: 0, name: '维护修改',itemStyle:{color:'#02A7F0'}}, - {value: 0, name: '维护删除',itemStyle:{color:'#87cebb'}}, + {value: this.tabledata1[0].preservedCount.totalCount, name: '维护无需修改'}, + {value: this.tabledata1[0].updatedCount.totalCount, name: '维护修改',itemStyle:{color:'#02A7F0'}}, + {value: this.tabledata1[0].deletedCount.totalCount, name: '维护删除',itemStyle:{color:'#87cebb'}}, ]:[ - {value: 0, name: '未维护'}, - {value: 0, name: '维护通过审核',itemStyle:{color:'#02A7F0'}}, - {value: 0, name: '维护中',itemStyle:{color:'#87cebb'}}, + {value: this.tabledata2[0].unMaintainCount.totalCount, name: '未维护'}, + {value: this.tabledata2[0].maintainedCount.totalCount, name: '维护通过审核',itemStyle:{color:'#02A7F0'}}, + {value: this.tabledata2[0].maintainingCount.totalCount, name: '维护中',itemStyle:{color:'#87cebb'}}, ], emphasis: { itemStyle: { @@ -150,8 +162,15 @@ export class ScheduledUpdatesComponent implements OnInit { //console.log(this.echartsData.scheduledUpdatesToggle) }); } - - + dwOryuan='danwei' + //点击单位按钮 + danweiClick(){ + this.dwOryuan='danwei' + } + //点击预案按钮 + yuanClick(){ + this.dwOryuan='yuan' + } } //首页条件查询
预案状态 + 新增 + 维护更新 + 预案名称 {{element.name}}