From af411b57e2be8344d02bb78431651ae46c9e35d2 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 10 Nov 2020 16:30:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=9F=E8=AE=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90=E8=AE=A1=E5=88=92=E5=92=8C=E5=88=A0=E9=99=A4=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry-plan/entry-plan.component.html | 18 ++ .../entry-plan/entry-plan.component.ts | 41 +++++ .../add-unit-one/add-unit-one.component.ts | 2 +- .../add-unit-three-bar-details.component.ts | 4 +- .../add-unit-three-line-details.component.ts | 4 +- .../add-unit-two-type-details.component.ts | 2 +- .../add-unit-two-type-statistics.component.ts | 6 +- .../building-type-one.component.ts | 2 +- .../building-type-three-details.component.ts | 2 +- .../building-type-two-forward.component.ts | 10 +- .../building-type-two-reverse.component.ts | 6 +- .../delete-four/delete-four.component.ts | 4 +- .../delete-one/delete-one.component.ts | 2 +- .../delete-there-line-details.component.ts | 4 +- .../delete-there/delete-there.component.ts | 8 +- .../delete-two-newadd.component.ts | 4 +- .../delete-two/delete-two.component.ts | 6 +- .../echarts-data.service.ts | 13 +- .../statistic-analysis/home/home.component.ts | 4 +- .../scheduled-updates/indexCondition.html | 42 +++++ .../scheduled-updates/publicEcharts.html | 5 +- .../scheduled-updates.component.html | 26 ++- .../scheduled-updates.component.scss | 42 +++-- .../scheduled-updates.component.ts | 158 +++++++++++++----- .../scheduled-updates/verified.html | 9 +- .../scheduled-updates/yueDate.html | 4 +- .../state/page-one/page-one.component.ts | 4 +- .../page-there-year.component.ts | 4 +- .../state/page-there/page-there.component.ts | 4 +- .../page-two-name/page-two-name.component.ts | 6 +- .../page-zhong-dui-details.component.ts | 4 +- .../statistic-analysis.module.ts | 4 +- 32 files changed, 337 insertions(+), 117 deletions(-) create mode 100644 src/app/statistic-analysis/scheduled-updates/indexCondition.html 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 64a4d64..c2ca7ee 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -83,6 +83,24 @@ 包含下级 +
+ + + + {{item.name}} + + + +
+
+ + + + {{item.name}} + + + +
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 4695575..d3604ab 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -43,6 +43,47 @@ export class EntryPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 + //支队提示框 + tableDataZhi = [ + {name:"浦东支队",number:"156",zhanbi:"3%"}, + {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, + {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, + {name:"长宁支队",number:"122",zhanbi:"1.6%"}, + {name:"静安支队",number:"120",zhanbi:"1.3%"}, + {name:"普陀支队",number:"100",zhanbi:"1.1%"}, + {name:"虹口支队",number:"95",zhanbi:"1%"}, + {name:"杨浦支队",number:"90",zhanbi:"0.9%"}, + {name:"闵行支队",number:"88",zhanbi:"0.8%"}, + {name:"宝山支队",number:"83",zhanbi:"0.7%"}, + {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, + {name:"长宁支队",number:"122",zhanbi:"1.6%"}, + {name:"嘉定支队",number:"78",zhanbi:"0.6%"}, + {name:"松江支队",number:"75",zhanbi:"0.5%"}, + {name:"金山支队",number:"65",zhanbi:"0.4%"}, + {name:"崇明支队",number:"55",zhanbi:"0.3%"}/* , + {name:"总计",number:"1356",zhanbi:"19%"} */ + ] + + //建筑类型提示框 + buildingType = [ + {name:"高层",number:"156",zhanbi:"3%"}, + {name:"地下",number:"144",zhanbi:"2.8%"}, + {name:"轨道交通",number:"133",zhanbi:"2.1%"}, + {name:"化工生产",number:"122",zhanbi:"1.6%"}, + {name:"储罐类",number:"120",zhanbi:"1.3%"}, + {name:"厂房",number:"100",zhanbi:"1.1%"}, + {name:"古建筑",number:"95",zhanbi:"1%"}, + {name:"商市场",number:"90",zhanbi:"0.9%"}, + {name:"医院",number:"88",zhanbi:"0.8%"}, + {name:"学校",number:"83",zhanbi:"0.7%"}, + {name:"宾馆",number:"133",zhanbi:"2.1%"}, + {name:"娱乐场所",number:"122",zhanbi:"1.6%"}, + {name:"餐饮业",number:"78",zhanbi:"0.6%"}, + {name:"影剧院",number:"75",zhanbi:"0.5%"}, + {name:"展览建筑",number:"65",zhanbi:"0.4%"}, + {name:"隧道",number:"55",zhanbi:"0.3%"}/* , + {name:"总计",number:"1356",zhanbi:"19%"} */ + ] displayedColumns: string[] = ['unitname', 'jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index e009421..1efe897 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -118,7 +118,7 @@ export class AddUnitOneComponent implements OnInit { this.indexBzt.setOption(options); } biaogeTishi(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts index d127bc7..2dbabaf 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts @@ -69,10 +69,10 @@ export class AddUnitThreeBarDetailsComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [300,290,280,270,260,250,240,230,220,210,200] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts index af2ba8a..04f363f 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts @@ -66,10 +66,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts index 9bd327e..3f15f97 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts @@ -51,7 +51,7 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index 9e1f5a5..a37fc2c 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -78,7 +78,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { }//柱状图数值顶部显示 tableDataZhi = [ {name:"浦东支队",number:"156",zhanbi:"3%"}, - {name:"黄埔支队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, {name:"长宁支队",number:"122",zhanbi:"1.6%"}, {name:"静安支队",number:"120",zhanbi:"1.3%"}, @@ -94,7 +94,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { {name:"金山支队",number:"65",zhanbi:"0.4%"}, {name:"崇明支队",number:"55",zhanbi:"0.3%"} ] tableDataZhong = [ {name:"浦东中队",number:"156",zhanbi:"3%"}, - {name:"黄埔中队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦中队",number:"144",zhanbi:"2.8%"}, {name:"徐汇中队",number:"133",zhanbi:"2.1%"}, {name:"长宁中队",number:"122",zhanbi:"1.6%"}, {name:"静安中队",number:"120",zhanbi:"1.3%"}, @@ -109,7 +109,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { {name:"松江中队",number:"75",zhanbi:"0.5%"}, {name:"金山中队",number:"65",zhanbi:"0.4%"}, {name:"崇明中队",number:"55",zhanbi:"0.3%"} ] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts index d25696a..9f48d2b 100644 --- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts @@ -101,7 +101,7 @@ export class BuildingTypeOneComponent implements OnInit { this.indexBzt.setOption(options); } biaogeTishi(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts index 3eab6d3..5ca8635 100644 --- a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts @@ -50,7 +50,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any detailPlanEchart diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts index b5dacf6..eff381e 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts @@ -78,7 +78,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { }//柱状图数值顶部显示 tableDataZhi = [ {name:"浦东支队",number:"156",zhanbi:"3%"}, - {name:"黄埔支队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, {name:"长宁支队",number:"122",zhanbi:"1.6%"}, {name:"静安支队",number:"120",zhanbi:"1.3%"}, @@ -94,7 +94,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { {name:"金山支队",number:"65",zhanbi:"0.4%"}, {name:"崇明支队",number:"55",zhanbi:"0.3%"} ] tableDataZhong = [ {name:"浦东中队",number:"156",zhanbi:"3%"}, - {name:"黄埔中队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦中队",number:"144",zhanbi:"2.8%"}, {name:"徐汇中队",number:"133",zhanbi:"2.1%"}, {name:"长宁中队",number:"122",zhanbi:"1.6%"}, {name:"静安中队",number:"120",zhanbi:"1.3%"}, @@ -109,7 +109,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { {name:"松江中队",number:"75",zhanbi:"0.5%"}, {name:"金山中队",number:"65",zhanbi:"0.4%"}, {name:"崇明中队",number:"55",zhanbi:"0.3%"} ] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队",'青浦支队'] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队",'青浦支队'] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70,60,50] tiaoshiPao:any //气泡提示数据获取 @@ -126,7 +126,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { } pieData = [ {value: 500, name: '浦东支队'}, - {value: 800, name: '黄埔支队'}, + {value: 800, name: '黄浦支队'}, {value: 900, name: '徐汇支队'}, {value: 800, name: '长宁支队'}, {value: 1200, name: '静安支队'}, @@ -144,7 +144,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit { buildingTypeName = ['高层','地下','轨道交通','化工生产','储罐类','厂房','古建筑','商市场','医院','学校','宾馆','娱乐场所','餐饮业','影剧院','展览建筑','隧道'] buildingTypeNum = [200,190,180,170,160,150,140,130,120,110,100,90,80,70,60,50] forArr = [{id:'gaoceng',name:'浦东支队',echart:null}, - {id:'dixia',name:'黄埔支队',echart:null}, + {id:'dixia',name:'黄浦支队',echart:null}, {id:'guidao',name:'徐汇支队',echart:null}, {id:'huagong',name:'长宁支队',echart:null}, {id:'chuguan',name:'静安支队',echart:null}, diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts index 2d407cd..01533c5 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts @@ -74,7 +74,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit { }//柱状图数值顶部显示 tableDataZhi = [ {name:"浦东支队",number:"156",zhanbi:"3%"}, - {name:"黄埔支队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, {name:"长宁支队",number:"122",zhanbi:"1.6%"}, {name:"静安支队",number:"120",zhanbi:"1.3%"}, @@ -90,7 +90,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit { {name:"金山支队",number:"65",zhanbi:"0.4%"}, {name:"崇明支队",number:"55",zhanbi:"0.3%"} ] tableDataZhong = [ {name:"浦东中队",number:"156",zhanbi:"3%"}, - {name:"黄埔中队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦中队",number:"144",zhanbi:"2.8%"}, {name:"徐汇中队",number:"133",zhanbi:"2.1%"}, {name:"长宁中队",number:"122",zhanbi:"1.6%"}, {name:"静安中队",number:"120",zhanbi:"1.3%"}, @@ -105,7 +105,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit { {name:"松江中队",number:"75",zhanbi:"0.5%"}, {name:"金山中队",number:"65",zhanbi:"0.4%"}, {name:"崇明中队",number:"55",zhanbi:"0.3%"} ] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts index 45241d3..4efb98b 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:58 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-10 14:23:36 + * @LastEditTime: 2020-11-10 14:33:29 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -21,7 +21,7 @@ declare var echarts: any; export class DeleteFourComponent implements OnInit { constructor(public route: ActivatedRoute,public data: EchartsDataService,public snackBar: MatSnackBar,private adapter: DateAdapter) { } - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any//气泡传入数据 level:string; diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts index 17b3342..8a30056 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts @@ -120,7 +120,7 @@ export class DeleteOneComponent implements OnInit { * @return {type} */ biaogeTishi(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts index 1d6dde8..4c5b642 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts @@ -67,10 +67,10 @@ export class DeleteThereLineDetailsComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts index 6825540..10c94cf 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:35 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-15 17:23:11 + * @LastEditTime: 2020-11-09 14:31:22 */ import { Component, OnInit } from '@angular/core'; import { Router,ActivatedRoute } from '@angular/router'; @@ -86,9 +86,9 @@ export class DeleteThereComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"] tiaoshiPao:any //气泡提示数据获取 bianli(){ @@ -218,7 +218,7 @@ export class DeleteThereComponent implements OnInit { /* 鼠标悬停提示 */ tableTooltip2(biaotou:string){ - var shuju='[{"name":"浦东中队","number":"156","zhanbi":"3%"},{"name":"黄埔中队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东中队","number":"156","zhanbi":"3%"},{"name":"黄浦中队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇中队","number":"133","zhanbi":"2.1%"},{"name":"长宁中队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安中队","number":"120","zhanbi":"1.3%"},{"name":"普陀中队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口中队","number":"95","zhanbi":"1%"},{"name":"杨浦中队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts index 7281054..26af019 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts @@ -65,10 +65,10 @@ export class DeleteTwoNewaddComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] tiaoshiPao:any //气泡提示数据获取 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 cbddf95..7621ebc 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 @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:21:18 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-05 08:59:05 + * @LastEditTime: 2020-11-10 14:34:15 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -70,7 +70,7 @@ export class DeleteTwoComponent implements OnInit { selectType:string = 'month'; //选择当前的 查询类型 按月/年 headZx//echarts实例 - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] @@ -315,7 +315,7 @@ export class DeleteTwoComponent implements OnInit { * @return {type} */ biaogeTishi(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 92230fc..8e7e826 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -6,6 +6,10 @@ import { Observable, ReplaySubject } from 'rxjs'; export class EchartsDataService { constructor() { } + //计划首页 + tableShow=false//控制首页表格显隐 + buildingName="" //建筑类型 + zhuXname=[""] //点击首页不同饼状图后面柱状图显示不同数据 //预案状态分析 statefulInspectionName:string; @@ -15,7 +19,8 @@ export class EchartsDataService { scheduledUpdatesType:number = 0; //已核查/未核查 scheduledUpdatesName:string; scheduledUpdatesXName:string; - scheduledUpdatesToggle:boolean = true; // 显示 当前点击 已核查/未核查 + //scheduledUpdatesToggle:string ="one"; // 显示 当前点击 已核查/未核查 + scheduledUpdatesToggle:number=1 eventEmit = new EventEmitter(); @@ -23,7 +28,7 @@ export class EchartsDataService { //支队提示框 tableDataZhi = [ {name:"浦东支队",number:"156",zhanbi:"3%"}, - {name:"黄埔支队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, {name:"长宁支队",number:"122",zhanbi:"1.6%"}, {name:"静安支队",number:"120",zhanbi:"1.3%"}, @@ -43,7 +48,7 @@ export class EchartsDataService { //中队提示框 tableDataZhong = [ {name:"浦东中队",number:"156",zhanbi:"3%"}, - {name:"黄埔中队",number:"144",zhanbi:"2.8%"}, + {name:"黄浦中队",number:"144",zhanbi:"2.8%"}, {name:"徐汇中队",number:"133",zhanbi:"2.1%"}, {name:"长宁中队",number:"122",zhanbi:"1.6%"}, {name:"静安中队",number:"120",zhanbi:"1.3%"}, @@ -406,7 +411,7 @@ export class EchartsDataService { res+='
' return res } - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] /** diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index 2c01a07..35d78bc 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -420,7 +420,7 @@ export class HomeComponent implements OnInit { // x轴 xAxis: { type: 'category', - data: ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"], + data: ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"], axisLabel: { interval: 0, @@ -507,7 +507,7 @@ export class HomeComponent implements OnInit { // x轴 xAxis: { type: 'category', - data: ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"], + data: ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"], axisLabel: { interval: 0, diff --git a/src/app/statistic-analysis/scheduled-updates/indexCondition.html b/src/app/statistic-analysis/scheduled-updates/indexCondition.html new file mode 100644 index 0000000..3eb9da5 --- /dev/null +++ b/src/app/statistic-analysis/scheduled-updates/indexCondition.html @@ -0,0 +1,42 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
名称 {{element.name}} 数量 {{element.number}} 总占比 {{element.zhanbi}}
+
\ No newline at end of file diff --git a/src/app/statistic-analysis/scheduled-updates/publicEcharts.html b/src/app/statistic-analysis/scheduled-updates/publicEcharts.html index f0bb5b2..8f49274 100644 --- a/src/app/statistic-analysis/scheduled-updates/publicEcharts.html +++ b/src/app/statistic-analysis/scheduled-updates/publicEcharts.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-05 08:59:24 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-11 14:54:52 + * @LastEditTime: 2020-11-09 15:08:46 -->
@@ -15,9 +15,10 @@

浦东支队1月份已核查案件高于平均值;黄浦支队1月份已核查案件高于平均值...

+
- +
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 2203108..afc4200 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html @@ -4,25 +4,35 @@ * @Author: sueRimn * @Date: 2020-11-03 10:19:24 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-05 09:01:41 + * @LastEditTime: 2020-11-10 13:55:45 -->
+
+
+ 建筑类型: + + + {{item.name}} + + + +
+
- - - - + +
-
-
+ +
+
-
+
\ 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 9f66c9b..6158ec5 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss @@ -23,6 +23,23 @@ width: 100%; height: 80px; border-bottom: 1px gray solid; + //display: flex; + /* flex-direction: row-reverse; + justify-content: space-around; */ + .find{ + margin-left: 260px; + float: left; + height: 100%; + align-items: center; + display: flex; + flex-direction: row; + justify-content: space-around; + button{ + margin-left: 15px; + width: 88px; + height: 36px; + } + } .btnbox{ display: flex; flex-direction:row-reverse; @@ -34,7 +51,7 @@ width: 88px; height: 36px; } - margin-right:4%; + margin-right:15%; } } .echartsbox{ @@ -42,15 +59,16 @@ height: 100%; overflow: auto; display: flex; + flex-direction: row; //justify-content:center; } #pie{ - width: 100%; + width: 50%; height: 93%; flex-direction: row } #pieTwo{ - width: 100%; + width: 50%; height: 93%; flex-direction: row } @@ -64,16 +82,17 @@ //table -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } -} + .table { + table { + width: 100%; + text-align: center; + .cdk-header-cell { + text-align: center; + } + } font-size: 30px; - width: 1000px; + width: 100%; height: 600px; overflow: auto; .tableHeader { @@ -83,6 +102,7 @@ table { } } + //滚动条样式 ::-webkit-scrollbar{ width: 5px; 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 6a6b170..1d305c7 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -3,8 +3,10 @@ import { Router } from '@angular/router'; import { ActivatedRoute } from '@angular/router'; import {EchartsDataService} from '../echarts-data.service' import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; declare var echarts: any; +//首页图形查询 @Component({ selector: 'app-scheduled-updates', templateUrl: './scheduled-updates.component.html', @@ -12,7 +14,7 @@ declare var echarts: any; }) export class ScheduledUpdatesComponent implements OnInit { - constructor(private router: Router,public echartsData:EchartsDataService) { } + constructor(private router: Router,public snackBar: MatSnackBar,public echartsData:EchartsDataService) { } ngOnInit(): void { window.setTimeout(()=>{ @@ -23,10 +25,34 @@ export class ScheduledUpdatesComponent implements OnInit { ngOnDestroy () { this.example.clear() - this.example.dispose() + //this.example.dispose() } example:any; + buildingShow:boolean=false //控制查询条件的显隐 + selectedBtn="tu" //两个查询按钮颜色控制 + chaxun:string="" + //图形查询点击事件 + tuClick(){ + this.buildingShow=false + this.selectedBtn="tu" + } + //条件查询 + tiaojianClick(){ + this.buildingShow=true + this.selectedBtn="tiaojian" + } + //查询按钮点击事件 + findClick(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + if(this.chaxun==""){this.snackBar.open('未选择单位','确定',config)} + else{ + this.echartsData.buildingName=this.chaxun + this.echartsData.tableShow=true + } + } /* 首页饼状图 */ initCharts(pieid){ this.example= echarts.init(document.getElementById(pieid),'walden'); @@ -98,14 +124,50 @@ export class ScheduledUpdatesComponent implements OnInit { this.example.setOption(options); this.example.on('click', (params) => { if(params.name=="维护删除"){this.router.navigateByUrl('/statisticanalysis/delete_one/delete_two');} - else{this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts');} + else{ + if(pieid=="pie"){ + this.echartsData.zhuXname=["平均值","维护无需修改","维护修改","维护删除"] + }else{this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"]} + this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); + } + console.log(this.echartsData.scheduledUpdatesToggle) }); } +} +//首页条件查询 +@Component({ + selector: 'app-indexCondition', + templateUrl: './indexCondition.html', + styleUrls: ['../state/page-two-time/page-two-time.component.scss'] +}) +export class indexConditionComponent implements OnInit { + + constructor(public router: ActivatedRoute,public echartsData:EchartsDataService,public route:Router) { } + + ngOnInit(): void { + window.setTimeout(()=>{ + + },0) + } + + ngOnDestroy () { + /* this.oneEcharts.dispose() + this.oneEcharts.clear() */ + } + + oneEcharts:any; + displayedColumns: string[] = ['name', 'weight', 'symbol']; + //点击支队名称跳转事件 + zhiClick(item){ + this.route.navigate(['/statisticanalysis/delete_one/delete_four'],{queryParams:{'level':item+this.echartsData.buildingName}}); + } + } +//所有页面头部 @Component({ selector: 'app-publicEcharts', templateUrl: './publicEcharts.html', @@ -116,26 +178,29 @@ export class publicEchartsComponent implements OnInit { constructor(private router: Router,public echartsData:EchartsDataService,public dialog: MatDialog,) { } ngOnInit(): void { - this.echartsData.scheduledUpdatesToggle = true + this.echartsData.scheduledUpdatesToggle = 1 } isToggle:boolean = true; // 已核查/未核查 //已核查 verified () { - this.isToggle = false - this.echartsData.scheduledUpdatesToggle = false + this.isToggle = true + //this.echartsData.scheduledUpdatesToggle ="one" + this.echartsData.scheduledUpdatesToggle =1 } //未核查 notVerified () { this.isToggle = false - this.echartsData.scheduledUpdatesToggle = true + //this.echartsData.scheduledUpdatesToggle = "three" + this.echartsData.scheduledUpdatesToggle =1 } //返回 goBack () { - this.echartsData.scheduledUpdatesToggle = true + this.echartsData.scheduledUpdatesToggle-- + console.log(this.echartsData.scheduledUpdatesToggle) } //更多 窗口 @@ -185,7 +250,7 @@ export class verifiedComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById('center'),'walden'); var option = { grid: { - top: 50, + top: 100, left:40, right: 20, //bottom: 20, @@ -266,21 +331,22 @@ export class verifiedComponent implements OnInit { ], }; this.oneEcharts.getZr().on('click', (params) => { - // console.log(params.name) - /* this.echartsData.statefulInspectionName =params.name+headtext; - this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); */ - const pointInPixel= [params.offsetX, params.offsetY]; + /* const pointInPixel= [params.offsetX, params.offsetY]; if (this.oneEcharts.containPixel('grid',pointInPixel)) { let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; - //this.echartsData.scheduledUpdatesToggle = false this.router.navigate(['/statisticanalysis/scheduledUpdates/yueDate'],{queryParams:{'level':option.xAxis.data[xIndex]}}); - //this.router.navigate(['/statisticanalysis/delete_two_newadd'],{queryParams:{'level':this.options.xAxis.data[xIndex],'headtext':headtext}}); - - /*事件处理代码书写位置*/ - //this.router.navigate(['/statisticanalysis/delete_one/delete_there'],{queryParams:{'level':this.options.xAxis.data[xIndex],'headtext':headtext}}); - //this.router.navigate(['/statisticanalysis/delete_two_newadd'],{queryParams:{'level':option.xAxis.data[xIndex]}}); + } */ + //let xIndex=this.items[index].echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; + const pointInPixel= [params.offsetX, params.offsetY]; + if (this.oneEcharts.containPixel('grid',pointInPixel)) { + let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; + /*事件处理代码书写位置*/ + this.echartsData.scheduledUpdatesType = 0 + //this.echartsData.scheduledUpdatesName = "ff" + this.echartsData.scheduledUpdatesToggle = 2 + this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex] } - + }); this.oneEcharts.setOption(option); } @@ -410,7 +476,7 @@ export class verifiedComponent implements OnInit { 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.scheduledUpdatesToggle = false this.echartsData.scheduledUpdatesXName=params.name console.log(this.echartsData.scheduledUpdatesXName) }); @@ -534,7 +600,7 @@ export class notVerifiedComponent implements OnInit { this.oneEcharts.on('click', (params) => { this.echartsData.scheduledUpdatesType = 1 this.echartsData.scheduledUpdatesName = params.name - this.echartsData.scheduledUpdatesToggle = false + this.echartsData.scheduledUpdatesToggle = 3 }); } @@ -549,7 +615,7 @@ export class notVerifiedComponent implements OnInit { }) export class yueDateComponent implements OnInit { - constructor(public router: ActivatedRoute,public echartsData:EchartsDataService) { } + constructor(public router: ActivatedRoute,public echartsData:EchartsDataService,public route:Router) { } level:string; ngOnInit(): void { @@ -572,7 +638,7 @@ export class yueDateComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); var option = { title: { - text: this.level+'总数:(500)', + text: this.echartsData.scheduledUpdatesXName+'已核查总数:(500)', top: -4, left: '35%', textStyle:{ @@ -588,7 +654,7 @@ export class yueDateComponent implements OnInit { } }, legend: { - data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], + data: this.echartsData.zhuXname, textStyle: { fontSize :16,color: '#000' } }, xAxis: [{ @@ -640,34 +706,34 @@ export class yueDateComponent implements OnInit { ], series: [ { - name: '已核查无需修改', + name: this.echartsData.zhuXname[1], type: 'bar', stack: '总数', data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45], barWidth :'38', }, { - name: '已核查修改中', + name: this.echartsData.zhuXname[2], type: 'bar', stack: '总数', data: [39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4], itemStyle:{color: '#626c91'} }, { - name: '已核查提交审核', + name: this.echartsData.zhuXname[3], type: 'bar', stack: '总数', data: [48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14], itemStyle:{color:'#c4ebad'} }, { - name: '平均值', + name: this.echartsData.zhuXname[0], 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, @@ -680,7 +746,7 @@ export class yueDateComponent implements OnInit { // yAxisIndex: 1, data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111], itemStyle:{color: '#999'} - }, + }, */ ] }; this.oneEcharts.setOption(option); @@ -692,6 +758,21 @@ export class yueDateComponent implements OnInit { this.echartsData.scheduledUpdatesXName=params.name console.log(this.echartsData.scheduledUpdatesXName) }); */ + this.oneEcharts.getZr().on('click', (params) => { + + const pointInPixel= [params.offsetX, params.offsetY]; + if (this.oneEcharts.containPixel('grid',pointInPixel)) { + let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; + /*事件处理代码书写位置*/ + this.echartsData.scheduledUpdatesType = 0 + console.log(option.xAxis) + this.echartsData.scheduledUpdatesName = option.xAxis[0].data[xIndex] + this.echartsData.scheduledUpdatesToggle = 3 + //this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex] + } + + }); + } @@ -743,7 +824,8 @@ export class detailedInformationComponent implements OnInit { } }, legend: { - data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], + //data: ['平均值','维护无需修改', '维护修改', '维护通过审核'], + data:this.echartsData.zhuXname, textStyle: { color: '#000',fontSize: 16 } }, xAxis: [{ @@ -781,34 +863,34 @@ export class detailedInformationComponent implements OnInit { ], series: [ { - name: '已核查无需修改', + name: this.echartsData.zhuXname[1], type: 'bar', stack: '总数', barWidth :'38', data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45], }, { - name: '已核查修改中', + name: this.echartsData.zhuXname[2], type: 'bar', stack: '总数', data: [39, 43, 49, 27, 53, 29, 38, 49, 29, 40, 40, 27, 54], itemStyle:{color: '#626c91'} }, { - name: '已核查提交审核', + name: this.echartsData.zhuXname[3], type: 'bar', stack: '总数', data: [48, 42, 43, 53, 47, 39, 25, 26, 54, 34, 39, 24, 14], itemStyle:{color:'#c4ebad'} }, { - name: '平均值', + name: this.echartsData.zhuXname[0], 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, @@ -821,7 +903,7 @@ export class detailedInformationComponent implements OnInit { // yAxisIndex: 1, data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111], itemStyle:{color: '#999'} - }, + }, */ ] }; this.example.setOption(option); diff --git a/src/app/statistic-analysis/scheduled-updates/verified.html b/src/app/statistic-analysis/scheduled-updates/verified.html index 7e27e1a..57e6bb7 100644 --- a/src/app/statistic-analysis/scheduled-updates/verified.html +++ b/src/app/statistic-analysis/scheduled-updates/verified.html @@ -4,11 +4,12 @@ * @Author: sueRimn * @Date: 2020-09-05 08:59:24 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-05 10:58:28 + * @LastEditTime: 2020-11-09 14:54:39 --> - -
-
+ + +
+
-
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts index d87cfbd..b262403 100644 --- a/src/app/statistic-analysis/state/page-one/page-one.component.ts +++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-01 15:24:39 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-11 15:35:09 + * @LastEditTime: 2020-11-10 14:35:31 */ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; @@ -115,7 +115,7 @@ export class PageOneComponent implements OnInit { * @return {type} */ biaogeTishi(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts index b629c77..b687ca7 100644 --- a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts +++ b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts @@ -66,10 +66,10 @@ export class PageThereYearComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] tiaoshiPao:any //气泡提示数据获取 diff --git a/src/app/statistic-analysis/state/page-there/page-there.component.ts b/src/app/statistic-analysis/state/page-there/page-there.component.ts index c0a5f1b..12ec4ac 100644 --- a/src/app/statistic-analysis/state/page-there/page-there.component.ts +++ b/src/app/statistic-analysis/state/page-there/page-there.component.ts @@ -81,9 +81,9 @@ export class PageThereComponent implements OnInit { fontSize: 12 } }//柱状图数值顶部显示 - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"] tiaoshiPao:any //气泡提示数据获取 bianli(){ diff --git a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts index 59e0d3f..62dfb98 100644 --- a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts +++ b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts @@ -86,7 +86,7 @@ export class PageTwoNameComponent implements OnInit { } }//柱状图上方显示数值 - zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] + zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] tiaoshiPao:any //气泡提示数据获取 @@ -478,7 +478,7 @@ export class PageTwoNameComponent implements OnInit { } tableTooltip(biaotou:string){ - var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄埔支队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东支队","number":"156","zhanbi":"3%"},{"name":"黄浦支队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安支队","number":"120","zhanbi":"1.3%"},{"name":"普陀支队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口支队","number":"95","zhanbi":"1%"},{"name":"杨浦支队","number":"90","zhanbi":"0.9%"},' @@ -509,7 +509,7 @@ export class PageTwoNameComponent implements OnInit { } tableTooltip2(biaotou:string){ - var shuju='[{"name":"浦东中队","number":"156","zhanbi":"3%"},{"name":"黄埔中队","number":"144","zhanbi":"2.8%"},' + var shuju='[{"name":"浦东中队","number":"156","zhanbi":"3%"},{"name":"黄浦中队","number":"144","zhanbi":"2.8%"},' shuju+='{"name":"徐汇中队","number":"133","zhanbi":"2.1%"},{"name":"长宁中队","number":"122","zhanbi":"1.6%"},' shuju+='{"name":"静安中队","number":"120","zhanbi":"1.3%"},{"name":"普陀中队","number":"100","zhanbi":"1.1%"},' shuju+='{"name":"虹口中队","number":"95","zhanbi":"1%"},{"name":"杨浦中队","number":"90","zhanbi":"0.9%"},' diff --git a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts index e4c4a0f..244d925 100644 --- a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts +++ b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-05 13:50:45 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-17 13:47:37 + * @LastEditTime: 2020-11-10 14:36:51 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -19,7 +19,7 @@ export class PageZhongDuiDetailsComponent implements OnInit { constructor( public route: ActivatedRoute,public data: EchartsDataService) { } - zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] + zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] tiaoshiPao:any headtext:string; diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts index e4d7220..661662a 100644 --- a/src/app/statistic-analysis/statistic-analysis.module.ts +++ b/src/app/statistic-analysis/statistic-analysis.module.ts @@ -53,7 +53,7 @@ import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.com //import { DeleteThereLineDetailsComponent } from './deleteUnit/delete-there-line-details/delete-there-line-details.component'; import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component'; import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component'; -import { ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent } from './scheduled-updates/scheduled-updates.component'; +import { ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,indexConditionComponent } from './scheduled-updates/scheduled-updates.component'; import { BuildingTypeTwoForwardComponent } from './buildingType/building-type-two-forward/building-type-two-forward.component'; import { BuildingTypeTwoReverseComponent } from './buildingType/building-type-two-reverse/building-type-two-reverse.component'; import { BuildingTypeThreeDetailsComponent } from './buildingType/building-type-three-details/building-type-three-details.component'; @@ -72,7 +72,7 @@ import { DeleteTwoNewaddComponent } from './deleteUnit/delete-two-newadd/delete- @NgModule({ - declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent], + declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent], imports: [ CommonModule, StatisticAnalysisRoutingModule,