From a34224174947f24a8cbe4551df8a6a73f61aacce Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Wed, 22 Dec 2021 09:20:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E5=8C=BA=E5=88=86=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=9B=B4=E6=96=B0=E8=BF=98=E6=98=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.html | 13 ++++++ .../key-unit-management.component.scss | 19 +++++++++ .../key-unit-management.component.ts | 5 ++- .../entry-plan-look.component.html | 7 ++++ .../entry-plan-look.component.scss | 19 +++++++++ .../entry-plan-look.component.ts | 4 +- .../entry-plan/entry-plan.component.html | 13 ++++++ .../entry-plan/entry-plan.component.scss | 19 +++++++++ .../entry-plan/entry-plan.component.ts | 7 ++-- .../meet-plan/meet-plan.component.html | 13 ++++++ .../meet-plan/meet-plan.component.scss | 19 +++++++++ .../meet-plan/meet-plan.component.ts | 5 ++- .../onetwo-entry-plan.component.html | 14 ++++++- .../onetwo-entry-plan.component.scss | 20 +++++++++ .../onetwo-entry-plan.component.ts | 5 ++- .../open-plan/open-plan.component.html | 14 ++++++- .../open-plan/open-plan.component.scss | 19 +++++++++ .../open-plan/open-plan.component.ts | 6 ++- .../pass-plan/pass-plan.component.html | 17 ++++++-- .../pass-plan/pass-plan.component.scss | 19 +++++++++ .../pass-plan/pass-plan.component.ts | 6 ++- .../reinforce-plan.component.html | 22 +++++++--- .../reinforce-plan.component.scss | 19 +++++++++ .../reinforce-plan.component.ts | 6 ++- .../type-plan/type-plan.component.html | 14 ++++++- .../type-plan/type-plan.component.scss | 19 +++++++++ .../type-plan/type-plan.component.ts | 5 ++- .../scheduled-updates.component.html | 10 +++-- .../scheduled-updates.component.scss | 4 ++ .../scheduled-updates.component.ts | 41 ++++++++++++++----- 30 files changed, 357 insertions(+), 46 deletions(-) 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' + } } //首页条件查询 From d1652a35797920e3a65259f30f7d0df458716935 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Thu, 23 Dec 2021 16:08:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E5=B7=A6=E4=BE=A7=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=BB=BA=E7=AD=91=E7=B1=BB=E5=9E=8B=E4=B8=8B=E9=92=BB?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.scss | 2 +- .../entry-plan/entry-plan.component.scss | 2 +- .../delete-two/delete-two.component.ts | 73 +-- .../echarts-data.service.ts | 81 ++- .../scheduled-updates.component.ts | 557 ++++++++++-------- src/index.html | 8 +- 6 files changed, 410 insertions(+), 313 deletions(-) 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 76e3338..656cbe6 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 @@ -100,7 +100,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 3be6ee6..f4a8f44 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.scss +++ b/src/app/plan-management/entry-plan/entry-plan.component.scss @@ -108,7 +108,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts index 2278e7a..e4926e1 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts @@ -7,7 +7,7 @@ * @LastEditTime: 2021-06-24 15:27:13 */ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { MatDatepickerInputEvent } from '@angular/material/datepicker'; import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; import { DateAdapter } from '@angular/material/core'; @@ -27,7 +27,7 @@ export class DeleteTwoComponent implements OnInit { dataniany=[0,0] tiaoshiPao:any//气泡 - constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService) { } + constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService, private route: ActivatedRoute) { } /* @ViewChild('appEcharts')appEcharts :echartsComponent; //父组件中获得子组件的引用 @ViewChild('pageTwoName')pageTwoName :PageTwoNameComponent; //父组件中获得子组件的引用 */ @@ -37,29 +37,7 @@ export class DeleteTwoComponent implements OnInit { this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex) //this.bianli() window.setTimeout(()=>{ - - this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) - /* this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) - this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) - this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey) - this.headZhexian('leftFour','古建筑',this.datayuex,this.datayuey) - this.headZhexian('rightOne','地下',this.datayuex,this.datayuey) - this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey) - this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey) - this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey) */ - - /* else if(this.selectType=='year'){ - this.headZhexian('heads','删除数量总统计',this.datanianx,this.dataniany) - this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) - this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) - this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey) - this.headZhexian('leftFour','古建筑',this.datayuex,this.datayuey) - this.headZhexian('rightOne','地下',this.datayuex,this.datayuey) - this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey) - this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey) - this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey) - } */ - + this.getechartsdata() },0) } ngOnDestroy():void{ @@ -85,36 +63,21 @@ export class DeleteTwoComponent implements OnInit { this.years.unshift(i) } } - + TimeType=0//按月查询还是按年查询 selectOneYear:any = (new Date()).getFullYear() //开始年份 selectTwoYear:any = (new Date()).getFullYear() //结束年份 selectStartMonth:any = 1 //开始月份 selectEndMonth:any = (new Date()).getMonth()+1 //结束月份 //点击月 monthClick(){ + this.TimeType=0 this.tiaoshiPao=null this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex) this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) - /* this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) - this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) - this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey) - this.headZhexian('leftFour','古建筑',this.datayuex,this.datayuey) - this.headZhexian('rightOne','地下',this.datayuex,this.datayuey) - this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey) - this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey) - this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey) */ } //按月查询 monthSubmit (e) { this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) - /* this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) - this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) - this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey) - this.headZhexian('leftFour','古建筑',this.datayuex,this.datayuey) - this.headZhexian('rightOne','地下',this.datayuex,this.datayuey) - this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey) - this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey) - this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey) */ if (e.selectTwoYear > e.selectOneYear) { let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 @@ -146,17 +109,10 @@ export class DeleteTwoComponent implements OnInit { selectEndYear:any = (new Date()).getFullYear() //结束年份 //点击年 yearClick(){ + this.TimeType=1 this.tiaoshiPao=null this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.dataniany,this.datanianx) this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany) - /* this.headZhexian('leftOne','高层',this.datanianx,this.dataniany) - this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany) - this.headZhexian('leftThere','储罐类',this.datanianx,this.dataniany) - this.headZhexian('leftFour','古建筑',this.datanianx,this.dataniany) - this.headZhexian('rightOne','地下',this.datanianx,this.dataniany) - this.headZhexian('rightTwo','化工生产',this.datanianx,this.dataniany) - this.headZhexian('rightThree','厂房',this.datanianx,this.dataniany) - this.headZhexian('rightFour','商市场',this.datanianx,this.dataniany) */ } //按年查询 yearSubmit (e) { @@ -193,6 +149,21 @@ export class DeleteTwoComponent implements OnInit { goBack(){ history.go(-1) } + //获取数据 + tabledata + async getechartsdata(){ + let Parameters={ + MaintainedState:this.route.snapshot.queryParams.type, + TimeType:this.TimeType, + TimeStart:this.TimeType==0?this.selectStartYear+'-'+this.selectStartMonth:this.selectStartYear, + TimeEnd:this.TimeType==0?this.selectEndYear+'-'+this.selectEndMonth:this.selectEndYear, + //OrganizationId + } + await this.echartsData.getData(Parameters,`/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) + } /** * @name: 折线图 @@ -223,7 +194,7 @@ export class DeleteTwoComponent implements OnInit { }, // 标题 title: { - text: `${headtext}`+':总数（0）', + text: `${headtext}`+`:总数（${this.tabledata[0].totalCount}）`, left:'center', top: -4, //副标题文本样式 diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index d72cad1..37fbe58 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -27,13 +27,16 @@ export class EchartsDataService { //维护删除 dezhiorBuinding="zhi" //维护删除页面判断是支队查询还是建筑类型查询 - + dateYear=new Date().getFullYear() + //计划更新统计 scheduledUpdatesType:number = 0; //已核查/未核查 scheduledUpdatesName:string; scheduledUpdatesXName:string; //scheduledUpdatesToggle:string ="one"; // 显示 当前点击 已核查/未核查 scheduledUpdatesToggle:number=1 + TimeType=0//按月查询还是按年查询 + time//点击的年份或者月份 eventEmit = new EventEmitter(); zhiorBuinding="zhi"//维护更新页面判断是支队查询还是建筑类型查询 @@ -548,7 +551,81 @@ export class EchartsDataService { this.res+='
预案状态 + 新增 + 维护更新 + 预案名称 {{element.name}}
' return this.res } - + //维护更新提示框第一层 + weihu(datas){ + if(datas.name=='维护删除'){ + for(var a in this.obdata[0].deletedCount){ + this.tishiData=this.obdata[0].deletedCount.organizationCounts + } + }else if(datas.name=='维护无需修改'){ + this.tishiData=this.obdata[0].preservedCount.organizationCounts + }else if(datas.name=='维护修改'){ + this.tishiData=this.obdata[0].updatedCount.organizationCounts + } + + console.log(this.tishiData) + var countall=0//总计 + var countbi=0//站比 + var allCountbi=0//总站比 + for(var i=0;i' + this.res+='
'; + this.res+=''; + this.res+=''; + this.res+='' + this.res+='' + this.res+='' + this.res+=''; + for(var i=0;i' + this.res+='' + this.res+='' + } + this.res+='' + this.res+='' + this.res+='
名称数量总占比
'+this.tishiData[i].count+''+countbi+'%
总计'+countall+'100%
' + return this.res + + } + //维护更新内部提示框 + weihuTooltip(datas){ + this.tishiData=this.obdata[0].items[0].organizations + var countall=0//总计 + var countbi=0//站比 + var allCountbi=0//总站比 + for(var i=0;i' + this.res+='
'; + this.res+=''; + this.res+=''; + this.res+='' + this.res+='' + this.res+='' + this.res+=''; + for(var i=0;i' + }else{ + this.res+='' + } + this.res+='' + this.res+='' + } + this.res+='' + this.res+='' + this.res+='
名称数量总占比
'+ this.tishiData[i].buildingTypeName+''+this.tishiData[i].count+''+countbi+'%
总计'+countall+'100%
' + return this.res + } zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] 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 1f91a78..adfd18f 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -53,15 +53,30 @@ export class ScheduledUpdatesComponent implements OnInit { 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") + if(this.dwOryuan=='danwei'){ + 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/Maintenance`) + this.tabledata2=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata2) + this.initCharts("pieTwo") + }else{ + await this.echartsData.getData(null,`/api/StatisticsAnalysis/Plans/Maintained`) + this.tabledata1=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata1) + this.initCharts("pie") + await this.echartsData.getData(null,`/api/StatisticsAnalysis/Plans/Maintenance`) + this.tabledata2=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata2) + this.initCharts("pieTwo") + } + + + } /* 首页饼状图 */ tabledata1 @@ -80,7 +95,8 @@ export class ScheduledUpdatesComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - return this.echartsData.tableTooltip(this.selectedBtn=="tu"?this.echartsData.tableDataZhi:this.echartsData.buildingType,params.name) + return this.weihu(params.data) + //return this.echartsData.tableTooltip(this.selectedBtn=="tu"?this.echartsData.tableDataZhi:this.echartsData.buildingType,params.name) }, position:this.echartsData.tableTooltipNoShow2 }, @@ -136,12 +152,12 @@ export class ScheduledUpdatesComponent implements OnInit { this.example.setOption(options); this.example.on('click', (params) => { this.echartsData.findShow=true - if(params.name=="维护删除"){this.router.navigateByUrl('/statisticanalysis/delete_one/delete_two');} + if(params.name=="维护删除"){this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_two?dwOryuan=${this.dwOryuan}&type=3`);} else{ if(pieid=="pie"){ this.echartsData.scheduledUpdatesToggle = 1 this.echartsData.zhuXname=["平均值","维护无需修改","维护修改","维护删除"] - this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); + this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${params.data.name=='维护修改'?2:1}&dwOryuan=${this.dwOryuan}`); }else{ this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"] @@ -166,10 +182,62 @@ export class ScheduledUpdatesComponent implements OnInit { //点击单位按钮 danweiClick(){ this.dwOryuan='danwei' + this.example.clear() + this.example.dispose() + this.getechartsdata() } //点击预案按钮 yuanClick(){ this.dwOryuan='yuan' + this.example.clear() + this.example.dispose() + this.getechartsdata() + } + //维护更新提示框 + tishiData + res + weihu(datas){ + if(datas.name=='维护删除'){ + this.tishiData=this.tabledata1[0].deletedCount.organizationCounts + }else if(datas.name=='维护无需修改'){ + this.tishiData=this.tabledata1[0].preservedCount.organizationCounts + }else if(datas.name=='维护修改'){ + this.tishiData=this.tabledata1[0].updatedCount.organizationCounts + }else if(datas.name=='维护中'){ + this.tishiData=this.tabledata2[0].maintainingCount.organizationCounts + }else if(datas.name=='未维护'){ + this.tishiData=this.tabledata2[0].unMaintainCount.organizationCounts + }else if(datas.name=='维护通过审核'){ + this.tishiData=this.tabledata2[0].maintainedCount.organizationCounts + } + + var countall=0//总计 + var countbi=0//站比 + var allCountbi=0//总站比 + for(var i=0;i' + this.res+='
'; + this.res+=''; + this.res+=''; + this.res+='' + this.res+='' + this.res+='' + this.res+=''; + for(var i=0;i' + this.res+='' + this.res+='' + } + this.res+='' + this.res+='' + this.res+='
名称数量总占比
'+this.tishiData[i].count+''+countbi+'%
总计'+countall+'100%
' + return this.res + } } @@ -241,22 +309,22 @@ export class publicEchartsComponent implements OnInit { changeTime(e){ console.log(e) //this.echartsData.selectType=0 - this.verifieds.changeTime(e.value) + this.verifieds.changeTime(e.value,this.selectOneYear,this.selectStartMonth,this.selectTwoYear,this.selectEndMonth) } //按月查询 monthSubmit (e) { - + console.log(this.echartsData.dateYear) if (e.selectTwoYear > e.selectOneYear) { let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 - // console.log(startTime) - // console.log(endTime) + this.verifieds.getechartsdata(this.echartsData.dateYear,e.selectStartMonth,this.echartsData.dateYear,e.selectEndMonth) } else if (e.selectTwoYear === e.selectOneYear) { if(e.selectEndMonth >= e.selectStartMonth) { let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 // console.log(startTime) // console.log(endTime) + this.verifieds.getechartsdata(this.echartsData.dateYear,e.selectStartMonth,this.echartsData.dateYear,e.selectEndMonth) } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -270,9 +338,6 @@ export class publicEchartsComponent implements OnInit { this.snackBar.open('请选择正确时间区段','确定',config); } } - - - selectStartYear:any = (new Date()).getFullYear() //开始年份 selectEndYear:any = (new Date()).getFullYear() //结束年份 @@ -281,6 +346,9 @@ export class publicEchartsComponent implements OnInit { if (e.selectEndYear >= e.selectStartYear) { let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 + e.selectStartYear+='-01-01' + e.selectEndYear+='-12-31' + this.verifieds.getechartsdata(e.selectStartYear,e.selectStartMonth,e.selectEndYear,e.selectEndMonth) } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -327,11 +395,17 @@ export class publicEchartsComponent implements OnInit { //支队查询 zhiFind(){ + this.verifieds.oneEcharts.clear() + this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="zhi" + this.verifieds.getechartsdata('2021','1','2022','12') } //建筑类型查询 buildingFind(){ + this.verifieds.oneEcharts.clear() + this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="building" + this.verifieds.getechartsdata('2021','1','2022','12') } @@ -348,13 +422,11 @@ export class publicEchartsComponent implements OnInit { }) export class verifiedComponent implements OnInit { - constructor(private router: Router,public echartsData:EchartsDataService,public snackBar: MatSnackBar) { } + constructor(private router: Router,public echartsData:EchartsDataService,public snackBar: MatSnackBar, private route: ActivatedRoute) { } ngOnInit(): void { window.setTimeout(()=>{ - this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydatayue,this.xdatayue) - this.oneInit(this.xdatayue,this.ydatayue) - //this.twoInit() + this.getechartsdata('2021','1','2022','12') },0) } @@ -366,16 +438,22 @@ export class verifiedComponent implements OnInit { element.echart.clear() }); } */ - async changeTime (e){ + //TimeType=0//按月查询还是按年查询 + async changeTime (e,selectOneYear,nselectStartMoth,selectTwoYear,selectEndMonth){ + console.log(e) this.oneEcharts.clear() this.oneEcharts.dispose() this.qipaotishi='' if(e=='year'){ + this.echartsData.TimeType=1 this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydataYear,this.xdataYear) - this.oneInit(this.xdataYear,this.ydataYear) + selectOneYear=selectOneYear+'-01-01' + selectTwoYear+='-12-31' + this.getechartsdata(selectOneYear,nselectStartMoth,selectTwoYear,selectEndMonth) }else{ + this.echartsData.TimeType=0 this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydatayue,this.xdatayue) - this.oneInit(this.xdatayue,this.ydatayue) + this.getechartsdata(selectOneYear,nselectStartMoth,selectTwoYear,selectEndMonth) } } @@ -385,34 +463,80 @@ export class verifiedComponent implements OnInit { ydatayue=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] xdataYear=['2020','2021'] ydataYear=['0','0'] + //获取后端数据 + tabledata + async getechartsdata(selectStartYear,selectStartMonth,selectEndYear,selectEndMonth){ + let Parameters={ + MaintainedState:this.route.snapshot.queryParams.type, + TimeType:this.echartsData.TimeType, + TimeStart:this.echartsData.TimeType==0?selectStartYear+'-'+selectStartMonth:selectStartYear, + TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + //OrganizationId + } + console.log(this.echartsData.zhiorBuinding) + if(this.echartsData.zhiorBuinding=="zhi"){ + await this.echartsData.getData(Parameters,this.route.snapshot.queryParams.dwOryuan=='danwei'? + `/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`:`/api/StatisticsAnalysis/Plans/Maintained/OrganizationTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.xdatayue=[] + this.ydatayue=[] + this.tabledata[0].items.forEach(element => { + this.xdatayue.push(element.date) + this.ydatayue.push(element.count) + }); + }else{ + await this.echartsData.getData(Parameters,`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.xdatayue=[] + this.ydatayue=[] + this.tabledata[0].items.forEach(element => { + this.xdatayue.push(element.date) + this.ydatayue.push(element.count) + }); + } + + this.oneInit(this.xdatayue,this.ydatayue) + } //提示框表格 - tableTooltip(dataArr,title:string){ - let data = dataArr - //console.log(data) - var res = '
'+title+'
' - res+='
'; - res+=''; - res+=''; - res+='' - res+='' - res+='' - res+='' - res+=''; - for(var i=0;i' - res+='' - res+='' - res+='' + tishiData + res + tableTooltip(datas){ + this.tishiData=this.tabledata[0].items[0].organizations + var countall=0//总计 + var countbi=0//站比 + var allCountbi=0//总站比 + for(var i=0;i' + this.res+='
名称数量环比总占比
'+data[i].number+''+data[i].zhanbi+''+data[i].zhanbi+'
'; + this.res+=''; + this.res+=''; + this.res+='' + this.res+='' + this.res+='' + this.res+=''; + for(var i=0;i' + }else{ + this.res+='' + } + this.res+='' + this.res+='' + } + this.res+='' + this.res+='' + this.res+='
名称数量总占比
'+ this.tishiData[i].buildingTypeName+''+this.tishiData[i].count+''+countbi+'%
总计'+countall+'100%
' + return this.res } + //图形数据 oneInit (xdata,ydata) { - this.oneEcharts = echarts.init(document.getElementById('center'),'walden'); var option = { grid: { @@ -423,7 +547,7 @@ export class verifiedComponent implements OnInit { }, // 标题 title: { - text: '已核查'+'总数：(0)', + text: `已核查 总数：(${this.tabledata[0].totalCount})`, top: -4, left: 'center', textStyle:{ @@ -439,7 +563,8 @@ export class verifiedComponent implements OnInit { borderWidth:'1', borderRadius :'0', */ formatter: (params)=>{ - return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) + return this.tableTooltip(params) + //return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) }, position:this.echartsData.tableTooltipNoShow2 }, @@ -514,9 +639,11 @@ export class verifiedComponent implements OnInit { if(this.echartsData.zhiorBuinding!="zhi"){ this.echartsData.findShow=false this.echartsData.scheduledUpdatesToggle = -2 - if(this.echartsData.level=='0'){ + if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].organizations.length>=1){ this.echartsData.scheduledUpdatesToggle = 2 - }else if(this.echartsData.level=='1'){ + //this.echartsData.time=xIndex + //this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${this.route.snapshot.queryParams.type}&TimeType=${this.TimeType}`); + }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].organizations.length>=1){ this.echartsData.scheduledUpdatesToggle = 3 } }else{ @@ -538,141 +665,13 @@ export class verifiedComponent implements OnInit { }); this.oneEcharts.setOption(option); + } months:any = ['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'] echartIds:any = ['one','two','three','four','five','six','seven','eight','nine','ten','eleven','twelve'] items:any = [{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null}] - twoInit () { - this.months.forEach((element,index) => { - this.items[index].echart = echarts.init(document.getElementById(this.echartIds[index]), 'skinUpp'); - var option = { - title: { - text: element+'总数:(500)', - top: -4, - left: '35%', - textStyle:{ - color:'#000', - fontSize: 30, - } - }, - //提示框 - tooltip: { - trigger: 'axis', - textStyle:{ - fontSize :18 - } - }, - legend: { - data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], - textStyle: { fontSize :16,color: '#000' } - }, - xAxis: [{ - axisLabel: { - textStyle:{ - fontSize :18, - color:'#000000' - }, - color: "#000", //刻度线标签颜色 - }, - //设置坐标轴字体颜色和宽度 - axisLine: { - lineStyle: {color: "#000",} - }, - type: 'category', - data: ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'], - axisPointer: {type: 'shadow'} - }], - yAxis: [ - { - //设置坐标轴字体颜色和宽度 - axisLine: { - lineStyle:{ - color:'#000000' - } - }, - type: 'value', - axisLabel: { - textStyle:{ - fontSize :18, - color:'#000000' - }, - color: "#000", //刻度线标签颜色 - formatter: '{value}' - } - }, - // { - // //设置坐标轴字体颜色和宽度 - // axisLine: { - // lineStyle: {color: "#000"}, - // }, - // type: 'value', - // name: '个', - // axisLabel: { - // color: "#000", //刻度线标签颜色 - // formatter: '{value}' - // } - // } - ], - series: [ - { - name: '已核查无需修改', - type: 'bar', - stack: '总数', - data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45], - barWidth :'38', - }, - { - name: '已核查修改中', - type: 'bar', - stack: '总数', - data: [39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4], - itemStyle:{color: '#626c91'} - }, - { - name: '已核查提交审核', - type: 'bar', - stack: '总数', - data: [48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14], - itemStyle:{color:'#c4ebad'} - }, - { - name: '平均值', - type: 'line', - // yAxisIndex: 1, - data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37], - itemStyle:{color: '#FFDC35'} - }, - { - name: '平均值2倍', - type: 'line', - // yAxisIndex: 1, - data: [98, 90, 106, 94, 98, 86, 96, 82, 76, 78, 82, 86, 74], - itemStyle:{color: '#6be6c1'} - }, - { - name: '平均值3倍', - type: 'line', - // yAxisIndex: 1, - data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111], - itemStyle:{color: '#999'} - }, - ] - }; - this.items[index].echart.setOption(option); - this.items[index].echart.on('click', (params) => { - let xIndex=this.items[index].echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; - this.echartsData.scheduledUpdatesType = 0 - this.echartsData.scheduledUpdatesName = this.months[index] - //this.echartsData.scheduledUpdatesToggle = false - this.echartsData.scheduledUpdatesXName=params.name - //console.log(this.echartsData.scheduledUpdatesXName) - }); - }); - } - - } @@ -816,7 +815,8 @@ export class yueDateComponent implements OnInit { }); window.setTimeout(()=>{ - this.twoInit() + this.getechartsdata() + },0) } @@ -824,15 +824,62 @@ export class yueDateComponent implements OnInit { this.oneEcharts.dispose() this.oneEcharts.clear() } - zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] - buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"] - + zhiNameData = [] + //buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"] + + //获取后端数据 + tabledata + organizationId=[] + ynum=[] + OrganizationIds=''//点击的组织 + async getechartsdata(){ + let Parameters={ + MaintainedState:this.router.snapshot.queryParams.type, + TimeType:this.echartsData.TimeType, + TimeStart:this.echartsData.scheduledUpdatesXName, + //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + OrganizationId:this.OrganizationIds + } + console.log(this.echartsData.zhiorBuinding) + await this.echartsData.getData(Parameters,this.echartsData.zhiorBuinding=='zhi'? `/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`:`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.zhiNameData=[] + this.tabledata[0].items[0].organizations.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + /* this.ydatayue=[] + this.tabledata[0].items.forEach(element => { + this.zhiNameData.push(element.date) + this.ydatayue.push(element.count) + }); */ + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData) + this.twoInit() + //this.oneInit(this.xdatayue,this.ydatayue) + } + tiaoshiPao:any + //气泡提示数据获取 + bianli(){ + var arrshuzu='['; + for(var i=0;i{ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + //return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) + }, + position:this.echartsData.tableTooltipNoShow2 }, legend: { right:10, data: this.echartsData.zhuXname, textStyle: { fontSize :16,color: '#000' } }, - xAxis: [{ + xAxis: { + id:this.organizationId, axisLabel: { textStyle:{ fontSize :18, @@ -868,8 +926,8 @@ export class yueDateComponent implements OnInit { type: 'category', data:this.zhiNameData, axisPointer: {type: 'shadow'} - }], - yAxis: [ + }, + yAxis: { //设置坐标轴字体颜色和宽度 axisLine: { @@ -899,74 +957,23 @@ export class yueDateComponent implements OnInit { // formatter: '{value}' // } // } - ], + series: [ { - name: this.echartsData.zhuXname[1], + //name: this.echartsData.zhuXname[1], type: 'bar', - stack: '总数', - data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + //stack: '总数', + data: this.ynum, barWidth :'38', + backgroundStyle: { + color: 'rgba(220, 220, 220, 0.8)' }, - { - name: this.echartsData.zhuXname[2], - type: 'bar', - stack: '总数', - data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0,0,0,0], - itemStyle:{color: '#626c91'} - }, - { - name: this.echartsData.zhuXname[3], - type: 'bar', - stack: '总数', - data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0], - itemStyle:{color:'#c4ebad'} - }, - { - name: this.echartsData.zhuXname[0], - type: 'line', - // yAxisIndex: 1, - data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0], - itemStyle:{color: '#FFDC35'} - }, - { - //name: '与上个月环比', - type: 'line', - // yAxisIndex: 1, - data: [0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0,0], - //itemStyle:{color: '#6be6c1'}, - + markPoint: { + data: this.tiaoshiPao + }, }, - /* { - //name: '警报', - type: 'effectScatter', - //coordinateSystem: 'cartesian2d', - data: [[0,0]], - symbolSize:30, - itemStyle: { - normal: { - color: 'red', - shadowBlur: 10, - shadowColor: '#333' - } - }, - - }, */ - /* { - name: '平均值2倍', - type: 'line', - // yAxisIndex: 1, - data: [98, 90, 106, 94, 98, 86, 96, 82, 76, 78, 82, 86, 74], - itemStyle:{color: '#6be6c1'} - }, - { - name: '平均值3倍', - type: 'line', - // yAxisIndex: 1, - data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111], - itemStyle:{color: '#999'} - }, */ + ] }; this.oneEcharts.setOption(option); @@ -984,11 +991,18 @@ export class yueDateComponent implements OnInit { if (this.oneEcharts.containPixel('grid',pointInPixel)) { let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; /*事件处理代码书写位置*/ + if(this.echartsData.zhiorBuinding=='zhi'){ + this.OrganizationIds=option.xAxis.id[xIndex] + this.getechartsdata() + this.echartsData.scheduledUpdatesType = 0 //console.log(option.xAxis) - this.echartsData.scheduledUpdatesName = option.xAxis[0].data[xIndex] + this.echartsData.scheduledUpdatesName = option.xAxis.data[xIndex] this.echartsData.scheduledUpdatesToggle = 3 - //this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex] + console.log(option.xAxis.id[xIndex]) + } + + } }); @@ -1028,6 +1042,41 @@ export class yuebuildingDateComponent implements OnInit { zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"] + //获取后端数据 + tabledata + async getechartsdata(selectStartYear,selectStartMonth,selectEndYear,selectEndMonth){ + let Parameters={ + MaintainedState:this.router.snapshot.queryParams.type, + TimeType:this.echartsData.TimeType, + TimeStart:this.echartsData.scheduledUpdatesXName, + //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + //OrganizationId + } + console.log(this.echartsData.zhiorBuinding) + if(this.echartsData.zhiorBuinding=="zhi"){ + await this.echartsData.getData(Parameters,`/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.zhiNameData=[] + /* this.ydatayue=[] + this.tabledata[0].items.forEach(element => { + this.zhiNameData.push(element.date) + this.ydatayue.push(element.count) + }); */ + }else{ + await this.echartsData.getData(Parameters,`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + /* this.xdatayue=[] + this.ydatayue=[] + this.tabledata[0].items.forEach(element => { + this.xdatayue.push(element.date) + this.ydatayue.push(element.count) + }); */ + } + + //this.oneInit(this.xdatayue,this.ydatayue) + } oneEcharts:any; twoInit () { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); diff --git a/src/index.html b/src/index.html index 7aab4f9..2ccf502 100644 --- a/src/index.html +++ b/src/index.html @@ -23,10 +23,10 @@ - - - + + + From e323530c1e3fe92b7a457e7decdd8fade4557d14 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Fri, 24 Dec 2021 16:09:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E5=8F=B3=E4=BE=A7=E9=A5=BC?= =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E4=B8=8B=E9=92=BB=E5=AF=B9=E6=8E=A5=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry-plan/entry-plan.component.html | 2 +- .../echarts-data.service.ts | 45 ++++- .../scheduled-updates/publicEcharts.html | 4 +- .../scheduled-updates.component.ts | 186 ++++++++++++------ 4 files changed, 172 insertions(+), 65 deletions(-) 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 76e1b0f..d5dac5c 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -140,7 +140,7 @@ - +
预案状态单位状态 新增 维护更新 diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 37fbe58..1992916 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -563,7 +563,7 @@ export class EchartsDataService { this.tishiData=this.obdata[0].updatedCount.organizationCounts } - console.log(this.tishiData) + //console.log(this.tishiData) var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 @@ -592,7 +592,7 @@ export class EchartsDataService { return this.res } - //维护更新内部提示框 + //维护更新左侧内部提示框 weihuTooltip(datas){ this.tishiData=this.obdata[0].items[0].organizations var countall=0//总计 @@ -626,6 +626,47 @@ export class EchartsDataService { this.res+='
' return this.res } + //维护更新右侧内部提示框 + weihuTooltipRight(datas,type){ + if(type=='1'){ + this.tishiData=this.obdata[0].unMaintainCount.organizationCounts + }else if(type=='2'){ + this.tishiData=this.obdata[0].maintainedCount.organizationCounts + }else if(type=='3'){ + this.tishiData=this.obdata[0].maintainingCount.organizationCounts + } + + var countall=0//总计 + var countbi=0//站比 + var allCountbi=0//总站比 + for(var i=0;i' + this.res+='
'; + this.res+=''; + this.res+=''; + this.res+='' + this.res+='' + this.res+='' + this.res+=''; + for(var i=0;i' + }else{ + this.res+='' + } + this.res+='' + this.res+='' + } + this.res+='' + this.res+='' + this.res+='
名称数量总占比
'+ this.tishiData[i].buildingTypeName+''+this.tishiData[i].count+''+countbi+'%
总计'+countall+'100%
' + return this.res + } zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] diff --git a/src/app/statistic-analysis/scheduled-updates/publicEcharts.html b/src/app/statistic-analysis/scheduled-updates/publicEcharts.html index 99f3f49..0f8e363 100644 --- a/src/app/statistic-analysis/scheduled-updates/publicEcharts.html +++ b/src/app/statistic-analysis/scheduled-updates/publicEcharts.html @@ -76,8 +76,8 @@
- - +
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 adfd18f..4bf5374 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -152,18 +152,17 @@ export class ScheduledUpdatesComponent implements OnInit { this.example.setOption(options); this.example.on('click', (params) => { this.echartsData.findShow=true - if(params.name=="维护删除"){this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_two?dwOryuan=${this.dwOryuan}&type=3`);} - else{ + //if(params.name=="维护删除"){this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_two?dwOryuan=${this.dwOryuan}&type=3`);} + if(pieid=="pie"){ this.echartsData.scheduledUpdatesToggle = 1 - this.echartsData.zhuXname=["平均值","维护无需修改","维护修改","维护删除"] - this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${params.data.name=='维护修改'?2:1}&dwOryuan=${this.dwOryuan}`); + //this.echartsData.zhuXname=["平均值","维护无需修改","维护修改","维护删除"] + this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${params.data.name=='维护修改'?2:params.data.name=='维护无需修改'?1:3}&dwOryuan=${this.dwOryuan}&pieid=pie`); }else{ - this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"] + //this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"] //this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); - if(this.echartsData.level=='0'){ - //总队跳转 + /* if(this.echartsData.level=='0'){ this.echartsData.scheduledUpdatesToggle = 2 this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); this.echartsData.findShow=false @@ -171,10 +170,14 @@ export class ScheduledUpdatesComponent implements OnInit { this.echartsData.scheduledUpdatesToggle = 3 this.echartsData.findShow=false this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); - } + } */ + this.echartsData.scheduledUpdatesToggle = 2 + this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?pieid=pieTwo&type=${params.data.name=='维护通过审核'?2:params.data.name=='未维护'?1:3}&dwOryuan=${this.dwOryuan}`); + this.echartsData.findShow=false + } - } + //console.log(this.echartsData.scheduledUpdatesToggle) }); } @@ -385,7 +388,13 @@ export class publicEchartsComponent implements OnInit { //this.router.navigateByUrl('/statisticanalysis/scheduledUpdates'); } } */ - window.history.go(-1) + if(this.verifieds.pieid=='pie'&& this.echartsData.scheduledUpdatesToggle>1){ + this.echartsData.scheduledUpdatesToggle-- + }else{ + this.router.navigateByUrl('/statisticanalysis/scheduledUpdates'); + //window.history.go(-1) + } + } //更多 窗口 @@ -398,14 +407,14 @@ export class publicEchartsComponent implements OnInit { this.verifieds.oneEcharts.clear() this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="zhi" - this.verifieds.getechartsdata('2021','1','2022','12') + this.verifieds.getechartsdata(this.echartsData.time,'1',this.echartsData.time,'12') } //建筑类型查询 buildingFind(){ this.verifieds.oneEcharts.clear() this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="building" - this.verifieds.getechartsdata('2021','1','2022','12') + this.verifieds.getechartsdata(this.echartsData.time,'1',this.echartsData.time,'12') } @@ -426,18 +435,20 @@ export class verifiedComponent implements OnInit { ngOnInit(): void { window.setTimeout(()=>{ - this.getechartsdata('2021','1','2022','12') + if(this.echartsData.scheduledUpdatesToggle==1){ + this.getechartsdata('2021','1','2022','12') + } + },0) + console.log(this.echartsData.scheduledUpdatesToggle) + this.pieid=this.route.snapshot.queryParams.pieid } - /* ngOnDestroy () { - this.oneEcharts.dispose() - this.oneEcharts.clear() - this.items.forEach((element,index) => { - element.echart.dispose() - element.echart.clear() - }); - } */ + ngOnDestroy () { + //this.oneEcharts.dispose() + //this.oneEcharts.clear() + } + pieid=this.route.snapshot.queryParams.pieid //TimeType=0//按月查询还是按年查询 async changeTime (e,selectOneYear,nselectStartMoth,selectTwoYear,selectEndMonth){ console.log(e) @@ -486,7 +497,8 @@ export class verifiedComponent implements OnInit { this.ydatayue.push(element.count) }); }else{ - await this.echartsData.getData(Parameters,`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) + await this.echartsData.getData(Parameters,this.route.snapshot.queryParams.dwOryuan=='danwei'? + `/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`:`/api/StatisticsAnalysis/Plans/Maintained/BuildingTypeTrend`) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) console.log(this.tabledata) this.xdatayue=[] @@ -634,17 +646,19 @@ export class verifiedComponent implements OnInit { let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; /*事件处理代码书写位置*/ this.echartsData.scheduledUpdatesType = 0 + this.echartsData.scheduledUpdatesToggle = 2 //this.echartsData.scheduledUpdatesName = "ff" - this.echartsData.zhiorBuinding!="zhi"?this.echartsData.scheduledUpdatesToggle = -2:this.echartsData.level=='0'? this.echartsData.scheduledUpdatesToggle = 2:this.echartsData.level=='1'?this.echartsData.scheduledUpdatesToggle = 3:'' + //this.echartsData.zhiorBuinding!="zhi"?this.echartsData.scheduledUpdatesToggle = -2:this.echartsData.level=='0'? this.echartsData.scheduledUpdatesToggle = 2:this.echartsData.level=='1'?this.echartsData.scheduledUpdatesToggle = 3:'' if(this.echartsData.zhiorBuinding!="zhi"){ this.echartsData.findShow=false - this.echartsData.scheduledUpdatesToggle = -2 + //this.echartsData.scheduledUpdatesToggle = -2 + if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].organizations.length>=1){ this.echartsData.scheduledUpdatesToggle = 2 //this.echartsData.time=xIndex //this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${this.route.snapshot.queryParams.type}&TimeType=${this.TimeType}`); }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].organizations.length>=1){ - this.echartsData.scheduledUpdatesToggle = 3 + this.echartsData.scheduledUpdatesToggle = 2//原来是3 } }else{ this.echartsData.findShow=true @@ -810,6 +824,7 @@ export class yueDateComponent implements OnInit { level:string; ngOnInit(): void { + //console.log(this.echartsData.scheduledUpdatesToggle) this.router.queryParams.subscribe(param=>{ this.level=param.level }); @@ -833,32 +848,64 @@ export class yueDateComponent implements OnInit { ynum=[] OrganizationIds=''//点击的组织 async getechartsdata(){ - let Parameters={ - MaintainedState:this.router.snapshot.queryParams.type, - TimeType:this.echartsData.TimeType, - TimeStart:this.echartsData.scheduledUpdatesXName, - //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, - OrganizationId:this.OrganizationIds + if(this.router.snapshot.queryParams.pieid!='pieTwo'){ + let Parameters={ + MaintainedState:this.router.snapshot.queryParams.type, + TimeType:this.echartsData.TimeType, + TimeStart:this.echartsData.scheduledUpdatesXName, + //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + OrganizationId:this.OrganizationIds + } + //console.log(this.echartsData.zhiorBuinding) + await this.echartsData.getData(Parameters,this.echartsData.zhiorBuinding=='zhi'? `/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`:`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.zhiNameData=[] + this.tabledata[0].items[0].organizations.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData) + this.twoInit() + }else{ + let Parameters={ + MaintenanceState:this.router.snapshot.queryParams.type, + //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + OrganizationId:this.OrganizationIds + } + await this.echartsData.getData(Parameters,this.echartsData.zhiorBuinding=='zhi'? `/api/StatisticsAnalysis/Companies/Maintenance`:`/api/StatisticsAnalysis/Plans/Maintenance`) + this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) + console.log(this.tabledata) + this.zhiNameData=[] + if(this.router.snapshot.queryParams.type=='1'){ + this.tabledata[0].unMaintainCount.organizationCounts.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + }else if(this.router.snapshot.queryParams.type=='2'){ + this.tabledata[0].maintainedCount.organizationCounts.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + }else if(this.router.snapshot.queryParams.type=='3'){ + this.tabledata[0].maintainingCount.organizationCounts.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + } + + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData) + this.twoInit() } - console.log(this.echartsData.zhiorBuinding) - await this.echartsData.getData(Parameters,this.echartsData.zhiorBuinding=='zhi'? `/api/StatisticsAnalysis/Companies/Maintained/OrganizationTrend`:`/api/StatisticsAnalysis/Companies/Maintained/BuildingTypeTrend`) - this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) - this.zhiNameData=[] - this.tabledata[0].items[0].organizations.forEach(element => { - this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) - this.ynum.push(element.count) - this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) - //this.ydatayue.push(element.count) - }); - /* this.ydatayue=[] - this.tabledata[0].items.forEach(element => { - this.zhiNameData.push(element.date) - this.ydatayue.push(element.count) - }); */ - this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData) - this.twoInit() - //this.oneInit(this.xdatayue,this.ydatayue) + } tiaoshiPao:any //气泡提示数据获取 @@ -879,7 +926,7 @@ export class yueDateComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); var option = { title: { - text: this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`, + text:this.router.snapshot.queryParams.pieid=='pieTwo'?'': this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`, top: -4, left: '35%', textStyle:{ @@ -899,7 +946,12 @@ export class yueDateComponent implements OnInit { fontSize :18 }, formatter: (params)=>{ - return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + if(this.router.snapshot.queryParams.pieid=='pieTwo'){ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltipRight(params,this.router.snapshot.queryParams.type):'' + }else{ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + } + //return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) }, position:this.echartsData.tableTooltipNoShow2 @@ -991,17 +1043,31 @@ export class yueDateComponent implements OnInit { if (this.oneEcharts.containPixel('grid',pointInPixel)) { let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; /*事件处理代码书写位置*/ - if(this.echartsData.zhiorBuinding=='zhi'){ + if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pie'){ this.OrganizationIds=option.xAxis.id[xIndex] - this.getechartsdata() + this.getechartsdata() + if(this.tabledata[0].items.length>=1){ + this.oneEcharts.dispose() + this.oneEcharts.clear() + //this.getechartsdata() + } - this.echartsData.scheduledUpdatesType = 0 - //console.log(option.xAxis) - this.echartsData.scheduledUpdatesName = option.xAxis.data[xIndex] - this.echartsData.scheduledUpdatesToggle = 3 - console.log(option.xAxis.id[xIndex]) + /* this.echartsData.scheduledUpdatesType = 0 + this.echartsData.scheduledUpdatesName = option.xAxis.data[xIndex] + this.echartsData.scheduledUpdatesToggle = 3 + console.log(option.xAxis.id[xIndex]) */ + }else if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pieTwo'){ + this.OrganizationIds=option.xAxis.id[xIndex] + this.getechartsdata() + if((this.router.snapshot.queryParams.type=='1'&&this.tabledata[0].unMaintainCount.organizationCounts.length>=1) + ||(this.router.snapshot.queryParams.type=='2'&&this.tabledata[0].maintainedCount.organizationCounts.length>=1) + ||(this.router.snapshot.queryParams.type=='3'&&this.tabledata[0].maintainingCount.organizationCounts.length>=1)){ + this.oneEcharts.dispose() + this.oneEcharts.clear() + //this.getechartsdata() + } + } - } From 0853c06dcbd2eff50d20455654264daa8ea27d80 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Sat, 25 Dec 2021 10:15:30 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E9=A2=84=E6=A1=88=E4=B8=8B=E9=92=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduled-updates.component.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 4bf5374..60a422e 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -349,8 +349,8 @@ export class publicEchartsComponent implements OnInit { if (e.selectEndYear >= e.selectStartYear) { let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 - e.selectStartYear+='-01-01' - e.selectEndYear+='-12-31' + e.selectStartYear+='-01' + e.selectEndYear+='-12' this.verifieds.getechartsdata(e.selectStartYear,e.selectStartMonth,e.selectEndYear,e.selectEndMonth) } else { const config = new MatSnackBarConfig(); @@ -407,14 +407,14 @@ export class publicEchartsComponent implements OnInit { this.verifieds.oneEcharts.clear() this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="zhi" - this.verifieds.getechartsdata(this.echartsData.time,'1',this.echartsData.time,'12') + this.verifieds.getechartsdata(this.echartsData.dateYear,'1',this.echartsData.dateYear,'12') } //建筑类型查询 buildingFind(){ this.verifieds.oneEcharts.clear() this.verifieds.oneEcharts.dispose() this.echartsData.zhiorBuinding="building" - this.verifieds.getechartsdata(this.echartsData.time,'1',this.echartsData.time,'12') + this.verifieds.getechartsdata(this.echartsData.dateYear,'1',this.echartsData.dateYear,'12') } @@ -436,7 +436,7 @@ export class verifiedComponent implements OnInit { ngOnInit(): void { window.setTimeout(()=>{ if(this.echartsData.scheduledUpdatesToggle==1){ - this.getechartsdata('2021','1','2022','12') + this.getechartsdata(this.echartsData.dateYear,'1',this.echartsData.dateYear,'12') } },0) @@ -457,9 +457,9 @@ export class verifiedComponent implements OnInit { this.qipaotishi='' if(e=='year'){ this.echartsData.TimeType=1 - this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydataYear,this.xdataYear) - selectOneYear=selectOneYear+'-01-01' - selectTwoYear+='-12-31' + this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydatayue,this.xdatayue) + selectOneYear=selectOneYear+'-01' + selectTwoYear+='-12' this.getechartsdata(selectOneYear,nselectStartMoth,selectTwoYear,selectEndMonth) }else{ this.echartsData.TimeType=0 @@ -480,8 +480,8 @@ export class verifiedComponent implements OnInit { let Parameters={ MaintainedState:this.route.snapshot.queryParams.type, TimeType:this.echartsData.TimeType, - TimeStart:this.echartsData.TimeType==0?selectStartYear+'-'+selectStartMonth:selectStartYear, - TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + TimeStart:this.echartsData.TimeType==0?selectStartYear+'-'+selectStartMonth:this.echartsData.dateYear+'-'+selectStartMonth, + TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:this.echartsData.dateYear+'-'+selectEndMonth, //OrganizationId } console.log(this.echartsData.zhiorBuinding) @@ -852,8 +852,8 @@ export class yueDateComponent implements OnInit { let Parameters={ MaintainedState:this.router.snapshot.queryParams.type, TimeType:this.echartsData.TimeType, - TimeStart:this.echartsData.scheduledUpdatesXName, - //TimeEnd:this.echartsData.TimeType==0?selectEndYear+'-'+selectEndMonth:selectEndYear, + TimeStart:this.echartsData.scheduledUpdatesXName+'-01', + TimeEnd:this.echartsData.scheduledUpdatesXName+'-12', OrganizationId:this.OrganizationIds } //console.log(this.echartsData.zhiorBuinding) @@ -861,6 +861,8 @@ export class yueDateComponent implements OnInit { this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) console.log(this.tabledata) this.zhiNameData=[] + this.ynum=[] + this.organizationId=[] this.tabledata[0].items[0].organizations.forEach(element => { this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) this.ynum.push(element.count) From 9f951e2ecd687f1c09c4f70afd9b473b38cb1b99 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Sat, 25 Dec 2021 11:13:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E=E8=B7=9F=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry-plan-look/entry-plan-look.component.scss | 2 +- src/app/plan-management/meet-plan/meet-plan.component.scss | 2 +- .../onetwo-entry-plan/onetwo-entry-plan.component.scss | 2 +- src/app/plan-management/open-plan/open-plan.component.scss | 2 +- src/app/plan-management/pass-plan/pass-plan.component.scss | 2 +- .../reinforce-plan/reinforce-plan.component.scss | 2 +- src/app/plan-management/type-plan/type-plan.component.scss | 2 +- .../scheduled-updates/scheduled-updates.component.ts | 4 ++++ 8 files changed, 11 insertions(+), 7 deletions(-) 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 789d27e..a50c639 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 @@ -33,7 +33,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index 6d53cef..644ca36 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -119,7 +119,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index 102e91e..c2a8398 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -129,7 +129,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; diff --git a/src/app/plan-management/open-plan/open-plan.component.scss b/src/app/plan-management/open-plan/open-plan.component.scss index 6d6857b..a67a989 100644 --- a/src/app/plan-management/open-plan/open-plan.component.scss +++ b/src/app/plan-management/open-plan/open-plan.component.scss @@ -97,7 +97,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 4672320..1bc22b6 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -103,7 +103,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 30d199d..3b8a265 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss @@ -98,7 +98,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 42f8719..9126325 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -119,7 +119,7 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 40px; + margin-left: 50px; } .weihu{ //display: block; 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 60a422e..360e0e2 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -171,6 +171,7 @@ export class ScheduledUpdatesComponent implements OnInit { this.echartsData.findShow=false this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); } */ + this.echartsData.zhiorBuinding='zhi' this.echartsData.scheduledUpdatesToggle = 2 this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?pieid=pieTwo&type=${params.data.name=='维护通过审核'?2:params.data.name=='未维护'?1:3}&dwOryuan=${this.dwOryuan}`); this.echartsData.findShow=false @@ -881,6 +882,8 @@ export class yueDateComponent implements OnInit { this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) console.log(this.tabledata) this.zhiNameData=[] + this.ynum=[] + this.organizationId=[] if(this.router.snapshot.queryParams.type=='1'){ this.tabledata[0].unMaintainCount.organizationCounts.forEach(element => { this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) @@ -1060,6 +1063,7 @@ export class yueDateComponent implements OnInit { console.log(option.xAxis.id[xIndex]) */ }else if(this.echartsData.zhiorBuinding=='zhi'&&this.router.snapshot.queryParams.pieid=='pieTwo'){ this.OrganizationIds=option.xAxis.id[xIndex] + //console.log(xIndex,option.xAxis.id[xIndex],this.organizationId) this.getechartsdata() if((this.router.snapshot.queryParams.type=='1'&&this.tabledata[0].unMaintainCount.organizationCounts.length>=1) ||(this.router.snapshot.queryParams.type=='2'&&this.tabledata[0].maintainedCount.organizationCounts.length>=1) From e6a03c8bb911b83d88a92caeab76614a9a64fcd6 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Sat, 25 Dec 2021 17:14:13 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E6=8F=90=E7=A4=BA=E6=A1=86?= =?UTF-8?q?=E6=9C=80=E5=A4=96=E5=B1=82=E5=B5=8C=E5=A5=97=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/statistic-analysis/echarts-data.service.ts | 8 ++++---- .../scheduled-updates/scheduled-updates.component.ts | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 1992916..22dd7ea 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -594,7 +594,7 @@ export class EchartsDataService { } //维护更新左侧内部提示框 weihuTooltip(datas){ - this.tishiData=this.obdata[0].items[0].organizations + this.tishiData=this.obdata[0].items[0].organizations[datas[0].dataIndex].subOrganizations var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 @@ -629,11 +629,11 @@ export class EchartsDataService { //维护更新右侧内部提示框 weihuTooltipRight(datas,type){ if(type=='1'){ - this.tishiData=this.obdata[0].unMaintainCount.organizationCounts + this.tishiData=this.obdata[0].unMaintainCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts }else if(type=='2'){ - this.tishiData=this.obdata[0].maintainedCount.organizationCounts + this.tishiData=this.obdata[0].maintainedCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts }else if(type=='3'){ - this.tishiData=this.obdata[0].maintainingCount.organizationCounts + this.tishiData=this.obdata[0].maintainingCount.organizationCounts[datas[0].dataIndex].subOrganizationCounts } var countall=0//总计 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 360e0e2..2f5c52c 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -951,12 +951,16 @@ export class yueDateComponent implements OnInit { fontSize :18 }, formatter: (params)=>{ - if(this.router.snapshot.queryParams.pieid=='pieTwo'){ - return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltipRight(params,this.router.snapshot.queryParams.type):'' - }else{ - return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + console.log(params) + if(params[0].axisValue.indexOf('救援站')==-1){ + if(this.router.snapshot.queryParams.pieid=='pieTwo'){ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltipRight(params,this.router.snapshot.queryParams.type):'' + }else{ + return this.echartsData.zhiorBuinding=='zhi'? this.echartsData.weihuTooltip(params):'' + } } + //return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) }, position:this.echartsData.tableTooltipNoShow2 From 0bcddd820854a06b6e7332913e7f42c83036b121 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Mon, 27 Dec 2021 17:11:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]ui=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.html | 10 +++--- .../entry-plan/entry-plan.component.html | 32 +++++++++++++------ .../meet-plan/meet-plan.component.html | 10 +++--- .../onetwo-entry-plan.component.html | 10 +++--- .../open-plan/open-plan.component.html | 6 ++-- .../pass-plan/pass-plan.component.html | 10 +++--- .../reinforce-plan.component.html | 2 +- .../type-plan/type-plan.component.html | 10 +++--- .../scheduled-updates.component.html | 7 ++-- .../scheduled-updates.component.scss | 18 ++++++++--- 10 files changed, 69 insertions(+), 46 deletions(-) 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 c46b9b0..f2ea551 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 @@ -16,7 +16,7 @@ 更多筛选条件 - 收起收起 @@ -44,9 +44,9 @@ 更多筛选条件 + (click)='pcInfo()'>更多筛选条件 收起 + (click)='pcInfo()'>收起
@@ -122,7 +122,7 @@
- +
@@ -153,7 +153,7 @@ - 预案状态 + 单位状态 新增 维护更新 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 d5dac5c..3a2ddc2 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -18,8 +18,8 @@ - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -64,8 +64,8 @@ 其他预案 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -125,16 +125,28 @@
-
- - - - + +
+ + + + 新增 + 维护更新 + +
- +
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 2f9d61f..3ef9c32 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -21,8 +21,8 @@ 包含下级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -45,8 +45,8 @@ - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -98,7 +98,7 @@
--> - +
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html index ee47180..9e99c67 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -28,8 +28,8 @@ 包含下级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -47,8 +47,8 @@ - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -90,7 +90,7 @@
- +
diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html index 3e9945f..24eae26 100644 --- a/src/app/plan-management/open-plan/open-plan.component.html +++ b/src/app/plan-management/open-plan/open-plan.component.html @@ -16,8 +16,8 @@ 包含下级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -61,7 +61,7 @@
- +
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 307b4d0..5a952fa 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -16,8 +16,8 @@ 包含下级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
clear
@@ -65,8 +65,8 @@ - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -120,7 +120,7 @@
- +
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 3a0dc1b..e9df805 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -93,7 +93,7 @@
- +
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 dbc2bd4..a7dffbb 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -21,8 +21,8 @@ 包含下级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -47,8 +47,8 @@ 审核退回 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起
@@ -76,7 +76,7 @@
- +
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 8c1f6ae..8234dd7 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html @@ -10,6 +10,10 @@
-->
+
+ + +
- - +
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 6991a6b..d307e31 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss @@ -32,6 +32,14 @@ flex-direction: column; overflow: hidden; position: relative; + .top{ + text-align: center; + button{ + width: 88px; + height: 36px; + margin-top: 20px; + } + } .topbox{ width: 100%; height: 80px; @@ -75,10 +83,7 @@ flex-direction: row; margin-top: 80px; //justify-content:center; - button{ - width: 88px; - height: 36px; - } + } #pie{ width: 50%; @@ -91,7 +96,10 @@ flex-direction: row } } - +.noselectedBtn{ + background-color: #E8E9E9; + color: #000000; +} .selectedBtn{ background-color: #2196f3; color: white;