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 aaed0aa..c55884c 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
@@ -21,6 +21,14 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
this.barEcharts()
},0)
}
+ ngOnDestroy(): void {
+ this.indexBzt.clear()
+ this.indexBzt.dispose()
+ this.forArr.forEach(item => {
+ item.echart.clear()
+ item.echart.dispose()
+ })
+ }
axisLabel = {
interval: 0,
formatter:function(value)
@@ -112,26 +120,27 @@ 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:'浦东支队'},
- {id:'dixia',name:'黄埔支队'},
- {id:'guidao',name:'徐汇支队'},
- {id:'huagong',name:'长宁支队'},
- {id:'chuguan',name:'静安支队'},
- {id:'changfang',name:'普陀支队'},
- {id:'gujianzhu',name:'虹口支队'},
- {id:'shichang',name:'杨浦支队'},
- {id:'yiyuan',name:'闵行支队'},
- {id:'xuexiao',name:'宝山支队'},
- {id:'binguan',name:'嘉定支队'},
- {id:'yule',name:'松江支队'},
- {id:'canyin',name:'金山支队'},
- {id:'yingyuan',name:'崇明支队'},
- {id:'zhanlan',name:'青浦支队'},
+ forArr = [{id:'gaoceng',name:'浦东支队',echart:null},
+ {id:'dixia',name:'黄埔支队',echart:null},
+ {id:'guidao',name:'徐汇支队',echart:null},
+ {id:'huagong',name:'长宁支队',echart:null},
+ {id:'chuguan',name:'静安支队',echart:null},
+ {id:'changfang',name:'普陀支队',echart:null},
+ {id:'gujianzhu',name:'虹口支队',echart:null},
+ {id:'shichang',name:'杨浦支队',echart:null},
+ {id:'yiyuan',name:'闵行支队',echart:null},
+ {id:'xuexiao',name:'宝山支队',echart:null},
+ {id:'binguan',name:'嘉定支队',echart:null},
+ {id:'yule',name:'松江支队',echart:null},
+ {id:'canyin',name:'金山支队',echart:null},
+ {id:'yingyuan',name:'崇明支队',echart:null},
+ {id:'zhanlan',name:'青浦支队',echart:null},
]
/* 顶部饼状图 */
+ indexBzt
initCharts(){
- let indexBzt = echarts.init(document.getElementById('pie'));
+ this.indexBzt = echarts.init(document.getElementById('pie'));
let options={
title: {
text: '组织机构统计（5500家）',
@@ -217,16 +226,16 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
}
]
};
- indexBzt.on('click', (params) => {
+ this.indexBzt.on('click', (params) => {
// this.router.navigateByUrl('/statisticanalysis/buildingType_two_forward');
});
- indexBzt.setOption(options);
+ this.indexBzt.setOption(options);
}
//柱状图
barEcharts(){
this.forArr.forEach(item=>{
let _this = this
- let Echart = echarts.init(document.getElementById(item.id));
+ item.echart = echarts.init(document.getElementById(item.id));
let option = {
color: ['#3398DB'],
title: {
@@ -265,8 +274,8 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
label: this.topTextlabel
}]
};
- Echart.setOption(option);
- Echart.on('click', (params) => {
+ item.echart.setOption(option);
+ item.echart.on('click', (params) => {
this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_three_details'],{queryParams:{'organizationName':item.name,'buildingTypeName':params.name}})
});
})
diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html
index bdb66e9..d8a4ac7 100644
--- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html
+++ b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html
@@ -2,7 +2,7 @@
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 22efeb3..15b3f06 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
@@ -22,7 +22,14 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
this.barEcharts()
},0)
}
-
+ ngOnDestroy(): void {
+ this.indexBzt.clear()
+ this.indexBzt.dispose()
+ this.forArr.forEach(item => {
+ item.echart.clear()
+ item.echart.dispose()
+ })
+ }
axisLabel = {
interval: 0,
formatter:function(value)
@@ -94,26 +101,27 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
{name:"崇明中队",number:"55",zhanbi:"0.3%"} ]
zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
- forArr = [{id:'gaoceng',name:'高层'},
- {id:'dixia',name:'地下'},
- {id:'guidao',name:'轨道交通'},
- {id:'huagong',name:'化工生产'},
- {id:'chuguan',name:'储罐类'},
- {id:'changfang',name:'厂房'},
- {id:'gujianzhu',name:'古建筑'},
- {id:'shichang',name:'商市场'},
- {id:'yiyuan',name:'医院'},
- {id:'xuexiao',name:'学校'},
- {id:'binguan',name:'宾馆'},
- {id:'yule',name:'娱乐场所'},
- {id:'canyin',name:'餐饮业'},
- {id:'yingyuan',name:'影剧院'},
- {id:'zhanlan',name:'展览建筑'},
- {id:'suidao',name:'隧道'}]
+ forArr = [{id:'gaoceng',name:'高层',echart:null},
+ {id:'dixia',name:'地下',echart:null},
+ {id:'guidao',name:'轨道交通',echart:null},
+ {id:'huagong',name:'化工生产',echart:null},
+ {id:'chuguan',name:'储罐类',echart:null},
+ {id:'changfang',name:'厂房',echart:null},
+ {id:'gujianzhu',name:'古建筑',echart:null},
+ {id:'shichang',name:'商市场',echart:null},
+ {id:'yiyuan',name:'医院',echart:null},
+ {id:'xuexiao',name:'学校',echart:null},
+ {id:'binguan',name:'宾馆',echart:null},
+ {id:'yule',name:'娱乐场所',echart:null},
+ {id:'canyin',name:'餐饮业',echart:null},
+ {id:'yingyuan',name:'影剧院',echart:null},
+ {id:'zhanlan',name:'展览建筑',echart:null},
+ {id:'suidao',name:'隧道',echart:null}]
/* 顶部饼状图 */
+ indexBzt
initCharts(){
- let indexBzt = echarts.init(document.getElementById('pie'));
+ this.indexBzt = echarts.init(document.getElementById('pie'));
let options={
title: {
text: '建筑类型统计（8900家）',
@@ -216,16 +224,16 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
}
]
};
- indexBzt.on('click', (params) => {
+ this.indexBzt.on('click', (params) => {
// this.router.navigateByUrl('/statisticanalysis/buildingType_two_forward');
});
- indexBzt.setOption(options);
+ this.indexBzt.setOption(options);
}
//柱状图
barEcharts(){
this.forArr.forEach(item=>{
let _this = this
- let addEchart = echarts.init(document.getElementById(item.id));
+ item.echart = echarts.init(document.getElementById(item.id));
let option = {
title: {
text: item.name,
@@ -263,12 +271,11 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
label: this.topTextlabel
}]
};
- addEchart.setOption(option);
- addEchart.on('click', (params) => {
+ item.echart.setOption(option);
+ item.echart.on('click', (params) => {
this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_three_details'],{queryParams:{'organizationName':params.name,'buildingTypeName':item.name}})
});
})
-
}
//提示框表格
tableTooltip(dataArr,title:string){
diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html
index 9799a59..6c4e2a5 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html
@@ -1 +1,13 @@
-
delete-four works!
+
+
diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
index e69de29..1e25505 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
@@ -0,0 +1,13 @@
+.detailBox{
+ width: 100%;
+ height: 100%;
+ position: relative;
+ #detailBox{
+ width: 100%;
+ height: 350px;
+ position: absolute;
+ left: 50%;
+ top: 45%;
+ transform: translate(-50%,-50%);
+ }
+}
\ No newline at end of file
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 95cb56e..011e610 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
@@ -1,4 +1,7 @@
import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {EchartsDataService} from '../../echarts-data.service'
+declare var echarts: any;
@Component({
selector: 'app-delete-four',
@@ -7,9 +10,80 @@ import { Component, OnInit } from '@angular/core';
})
export class DeleteFourComponent implements OnInit {
- constructor() { }
+ constructor(public route: ActivatedRoute,public data: EchartsDataService) { }
+ zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"]
+ zhongNumData = [200,190,180,170,160,150,140,130,120,110,100]
ngOnInit(): void {
+ window.setTimeout(()=>{
+ this.detailEcharts()
+ })
+ }
+
+ detailEcharts(){
+ var detailPlanEchart = echarts.init(document.getElementById('detailBox'));
+ var option = {
+ title: {
+ text: this.data.statefulInspectionName,
+ left: "center",
+ textStyle: {
+ fontSize: 28
+ }
+ },
+ xAxis: {
+ type: 'category',
+ data: this.zhongNameData,
+ // axisLabel: this.axisLabel
+ },
+ yAxis: {
+ type: 'value'
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: (params)=>{
+ console.log(666,params)
+ return this.tableTooltip(params)
+ },
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0'
+ },
+ series: [{
+ data: this.zhongNumData,
+ type: 'bar',
+ showBackground: true,
+ backgroundStyle: {
+ color: 'rgba(220, 220, 220, 0.8)'
+ }
+ }]
+ };
+ detailPlanEchart.setOption(option);
+ }
+
+
+ tableTooltip(params:any){
+ var data = [
+ {name:params.name,number:params.value,zhanbi:(params.value/1340 * 100).toFixed(2) + "%"}
+ ]
+ var res = '
'+params.name+'
'
+ res+='
';
+ res+='';
+ res+='| 名称 | ';
+ res+='数量 | '
+ res+='总占比 | '
+ res+='
'
+ res+='';
+ for(var i=0;i'
+ res+=''+data[i].number+' | '
+ res+=''+data[i].zhanbi+' | '
+ }
+
+ res+=''
+ // res+='总计 | 1356 | 19% | '
+ res+='
'
+ return res
}
}
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 3169f9b..8f1f8fa 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
@@ -1,12 +1,6 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: sueRimn
- * @Date: 2020-09-02 16:15:53
- * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-02 16:44:32
- */
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+declare var echarts: any;
@Component({
selector: 'app-delete-one',
@@ -14,10 +8,139 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./delete-one.component.scss']
})
export class DeleteOneComponent implements OnInit {
+ options:any;
- constructor() { }
+ constructor(private router: Router) { }
- ngOnInit(): void {
+ ngOnInit() {
+ window.setTimeout(()=>{
+ this.initCharts()
+ },0)
+ }
+
+ /* 首页饼状图 */
+ initCharts(){
+ //console.log(document.getElementById('indexBzt'))
+
+ var ec = echarts as any;
+ var indexBzt = ec.init(document.getElementById('indexBzt'));
+ var options={
+ title: {
+ text: '删除单位统计（8900家）',
+ //subtext: '纯属虚构',
+ padding:[120,100],
+ left: 'center',
+ textStyle:{
+ fontSize:38
+ }
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: (params)=>{
+ return this.biaogeTishi(params.name)
+ } ,
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0'
+
+
+ },
+ legend: {
+ orient: 'vertical',
+ right: 150,
+ top:80,
+ //padding:20,
+ itemWidth:60,
+ itemHeight:25,
+ textStyle:{
+ fontSize:28
+ },
+ data: ['高层', '地下', '轨道交通', '化工生产', '储罐类', '厂房', '古建筑', '商市场', '医院', '学校', '宾馆', '娱乐场所', '餐饮业', '影剧院', '展览建筑', '隧道']
+ },
+ series: [
+ {
+ name: '访问来源',
+ type: 'pie',
+ radius: '65%',
+ center: ['50%', '60%'],
+ label:{
+ normal:{
+ show:true,
+ position: 'inner',
+ fontSize:18,
+ formatter:'{c} ({d}%)'
+ }
+
+ },
+ data: [
+ {value: 500, name: '高层'},
+ {value: 1300, name: '地下',itemStyle:{color:'#02A7F0'}},
+ {value: 1500, name: '轨道交通'},
+ {value: 1500, name: '化工生产'},
+ {value: 1700, name: '储罐类'},
+ {value: 800, name: '厂房'},
+ {value: 1500, name: '古建筑'},
+ {value: 1500, name: '商市场'},
+ {value: 1700, name: '医院'},
+ {value: 1700, name: '学校'},
+ {value: 1700, name: '宾馆'},
+ {value: 1700, name: '娱乐场所'},
+ {value: 1700, name: '餐饮业'},
+ {value: 1700, name: '影剧院'},
+ {value: 1700, name: '展览建筑'},
+ {value: 1700, name: '隧道'}
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+ indexBzt.on('click', (params) => {
+ this.router.navigateByUrl('/statisticanalysis/delete_one/delete_two');
+ });
+ indexBzt.setOption(options);
+ }
+ /**
+ * @name: 表格提示框封装
+ * @test: test font
+ * @msg:
+ * @param {string(表头)}
+ * @return {type}
+ */
+ biaogeTishi(biaotou:string){
+ 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%"},'
+ shuju+='{"name":"闵行支队","number":"88","zhanbi":"0.8%"},{"name":"宝山支队","number":"83","zhanbi":"0.7%"},'
+ shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},'
+ shuju+='{"name":"嘉定支队","number":"78","zhanbi":"0.6%"},{"name":"松江支队","number":"75","zhanbi":"0.5%"},'
+ shuju+='{"name":"金山支队","number":"65","zhanbi":"0.4%"},{"name":"崇明支队","number":"55","zhanbi":"0.3%"}]'
+ var jsonObj = JSON.parse(shuju);
+ var res = '
'+biaotou+'
'
+ res+='
';
+ res+='';
+ res+='| 名称 | ';
+ res+='数量 | '
+ res+='总占比 | '
+ res+='
'
+ res+='';
+ for(var i=0;i'
+ res+=''+jsonObj[i].number+' | '
+ res+=''+jsonObj[i].zhanbi+' | '
+ }
+
+ res+=''
+ res+='总计 | 1356 | 19% | '
+ res+='
'
+ return res
}
}
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
index 0c3246a..35c1ef9 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
@@ -1 +1,26 @@
-
delete-there works!
+
+
+
+
+
+
+
+
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
index e69de29..56b353c 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
@@ -0,0 +1,22 @@
+.head{
+ //display: flex;
+ border-bottom:2px solid #d4dde4;
+ width: 100%;
+ height: 100px;
+ background-color:white ;
+}
+.chaxun{
+ background-color: #008CBA;
+ color: white;
+ border-radius:5px;
+ font-size: 16px;
+ margin-left: 50px;
+ padding: 15px 32px;
+}
+.zhu{
+ padding-top: 200px;
+ padding-left: 200px;
+ text-align: center;
+ height: 270px;
+ width: 880px;
+}
\ No newline at end of file
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 d8963ed..0c88ffd 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
@@ -1,4 +1,15 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: sueRimn
+ * @Date: 2020-09-02 16:22:35
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-09-05 08:58:18
+ */
import { Component, OnInit } from '@angular/core';
+import { Router,ActivatedRoute } from '@angular/router';
+import {EchartsDataService} from '../../echarts-data.service'
+declare var echarts: any;
@Component({
selector: 'app-delete-there',
@@ -7,9 +18,107 @@ import { Component, OnInit } from '@angular/core';
})
export class DeleteThereComponent implements OnInit {
- constructor() { }
+ constructor(private router: Router,private activatedRoute: ActivatedRoute,public echartsData:EchartsDataService) { }
ngOnInit(): void {
+ let headtext:string;
+ let datayuex:string;
+ let headName:string;
+ this.activatedRoute.params.subscribe(param=>{
+ headtext=param.headtext
+ datayuex=param.datayuex
+ headName=headtext+''+datayuex;
+ //console.log(datayuex)
+ });
+ window.setTimeout(()=>{
+ this.zhuzhuangtu(headName)
+ },0)
+ }
+ zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
+ zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
+ /* 柱状图 */
+ zhuzhuangtu(headName:string){
+ var ec = echarts as any;
+ var zhutu = ec.init(document.getElementById('zhidui'));
+ var option = {
+ title: {
+ text: `${headName}`,
+ left: "center",
+ top: "15",
+ textStyle: {
+ fontSize: 23
+ }
+ },
+ grid: {
+ left: '5%',
+ bottom:'35%'
+ },
+ xAxis: {
+ type: 'category',
+ data: this.zhiNameData,
+ //axisLabel: this.axisLabel
+ },
+ yAxis: {
+ type: 'value'
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: (params)=>{
+ return this.tableTooltip2(params.name)
+ },
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0'
+ },
+ series: [{
+ data: this.zhiNumData,
+ type: 'bar',
+ showBackground: true,
+ backgroundStyle: {
+ color: 'rgba(220, 220, 220, 0.8)'
+ },
+ barWidth :'28',
+ //label: this.topTextlabel
+ }]
+ };
+ zhutu.on('click', (params) => {
+ console.log(params)
+ this.echartsData.statefulInspectionName =params.name;
+ this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_four`);
+ });
+ zhutu.setOption(option);
+ }
+
+
+ tableTooltip2(biaotou:string){
+ 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%"},'
+ shuju+='{"name":"闵行中队","number":"88","zhanbi":"0.8%"},{"name":"宝山中队","number":"83","zhanbi":"0.7%"},'
+ shuju+='{"name":"徐汇中队","number":"133","zhanbi":"2.1%"},{"name":"长宁中队","number":"122","zhanbi":"1.6%"},'
+ shuju+='{"name":"嘉定中队","number":"78","zhanbi":"0.6%"},{"name":"松江中队","number":"75","zhanbi":"0.5%"},'
+ shuju+='{"name":"金山中队","number":"65","zhanbi":"0.4%"},{"name":"崇明中队","number":"55","zhanbi":"0.3%"}]'
+ var jsonObj = JSON.parse(shuju);
+ var res = '
'+biaotou+'
'
+ res+='
';
+ res+='';
+ res+='| 名称 | ';
+ res+='数量 | '
+ res+='总占比 | '
+ res+='
'
+ res+='';
+ for(var i=0;i'
+ res+=''+jsonObj[i].number+' | '
+ res+=''+jsonObj[i].zhanbi+' | '
+ }
+
+ res+=''
+ res+='总计 | 1356 | 19% | '
+ res+='
'
+ return res
}
}
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
index de3a6f2..da06b47 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
@@ -1 +1,90 @@
-
delete-two works!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
index e69de29..92033cf 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
@@ -0,0 +1,95 @@
+body{
+ overflow:auto;
+}
+.daohang{
+ display: flex;
+ z-index: 5;
+ border-bottom:2px solid #d4dde4;
+ width: 100%;
+ height: 180px;
+ background-color:white ;
+}
+
+.chaxun{
+ background-color: #008CBA;
+ color: white;
+ border-radius:5px;
+ //font-size: 16px;
+ margin-left: 50px;
+}
+.head{
+ text-align:center;
+ margin:0 auto;
+ width: 900px;
+ height: 400px;
+ padding-top: 250px;
+}
+.mainbox {
+ padding-bottom: 50px;
+ min-width: 1024px;
+ max-width: 1920px;
+ padding: 0.125rem 0.125rem 0;
+ display: flex;
+ .column {
+ flex: 2;
+
+ }
+ }
+ .panel {
+ position: relative;
+ height: 400px;
+ border: 1px solid rgba(25, 186, 139, 0.17);
+ padding: 0 0.1875rem 0.5rem;
+ margin-bottom: 0.1875rem;
+ &::before {
+ position: absolute;
+ top: 0;
+ left: 0;
+ content: "";
+ width: 10px;
+ height: 10px;
+ border-top: 2px ;
+ border-left: 2px ;
+ }
+ &::after {
+ position: absolute;
+ top: 0;
+ right: 0;
+ content: "";
+ width: 10px;
+ height: 10px;
+ border-top: 2px ;
+ border-right: 2px ;
+ }
+ .panel-footer {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ &::before {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ content: "";
+ width: 10px;
+ height: 10px;
+ border-bottom: 2px ;
+ border-left: 2px ;
+ }
+ &::after {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ content: "";
+ width: 10px;
+ height: 10px;
+ border-bottom: 2px ;
+ border-right: 2px ;
+ }
+ }
+
+
+ .chart {
+ height: 3rem;
+ }
+ }
\ No newline at end of file
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 52b6ee5..0d2386d 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
@@ -1,4 +1,16 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: sueRimn
+ * @Date: 2020-09-02 16:21:18
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-09-04 16:58:01
+ */
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { MatDatepickerInputEvent } from '@angular/material/datepicker';
+import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
+declare var echarts: any;
@Component({
selector: 'app-delete-two',
@@ -6,10 +18,180 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./delete-two.component.scss']
})
export class DeleteTwoComponent implements OnInit {
+ options:any;
+ datayuex=['一月', '二月', '三月', '四月', '五月', '六月', '七月','八月'];
+ datayuey=[210, 160, 150, 140, 130, 120, 110,120];
+ datanianx=[2019,2020,2021];
+ dataniany=[201,174]
- constructor() { }
+ constructor(private router: Router,public snackBar: MatSnackBar) { }
ngOnInit(): void {
+ window.setTimeout(()=>{
+ this.headZhexian('head','删除数量总统计',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)
+ },0)
+ }
+ /* 按月点击事件 */
+ anyue(){
+ var anyue1 = document.getElementById('yue1');
+ anyue1.style.display='block';
+ var anyue2 = document.getElementById('yue2');
+ anyue2.style.display='block';
+ this.headZhexian('head','删除数量总统计',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)
+ }
+ /* 按年点击事件 */
+ annian(){
+ var anyue1 = document.getElementById('yue1');
+ anyue1.style.display='none';
+ var anyue2 = document.getElementById('yue2');
+ anyue2.style.display='none';
+ this.headZhexian('head','删除数量总统计',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)
}
+ /* 折线图 */
+ headZhexian(divid:string,headtext:string,datayuex,datayuey){
+ var ec = echarts as any;
+ var headZx = ec.init(document.getElementById(`${divid}`));
+ var options = {
+ title: {
+ text: `${headtext}`,
+ left:350,
+ textStyle:{
+ fontSize:28
+ }
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: (params)=>{
+ return this.biaogeTishi(`${headtext}`)
+ } ,
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0'
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap:false,
+ data: datayuex,
+ axisLabel: {
+ color: "#000", //刻度线标签颜色
+ },
+ //设置坐标轴字体颜色和宽度
+ axisLine: {
+ lineStyle: {
+ color: "#000",
+ },
+ },
+ splitLine: {//分割线配置
+ show:true,
+ lineStyle: {
+ color: '#999',
+ }
+ }
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ color: "#000" //刻度线标签颜色
+ },
+ //设置坐标轴字体颜色和宽度
+ axisLine: {
+ lineStyle: {
+ color: "#000",
+ }
+ }
+ },
+ series: [{
+ data: datayuey,
+ type: 'line',
+ lineStyle:{
+ color:'#1369bf'
+ },
+ /* markLine: {
+ symbol: ['none', 'none'],
+ label: {show: false},
+ lineStyle:{
+ color:'#9A9A9A',
+ type:'solid',
+ },
+ data: [
+ {xAxis: 1},
+ {xAxis: 2},
+ {xAxis: 3},
+ {xAxis: 4},
+ {xAxis: 5},
+ {xAxis: 6},
+ {xAxis: 7}
+ ]
+ }, */
+ }]
+ };
+ headZx.on('click', (params) => {
+ console.log(params)
+ this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there/${headtext}/${params.name}`);
+ });
+ headZx.setOption(options);
+ }
+ /**
+ * @name: 表格提示框封装
+ * @test: test font
+ * @msg:
+ * @param {string(表头)}
+ * @return {type}
+ */
+ biaogeTishi(biaotou:string){
+ 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%"},'
+ shuju+='{"name":"闵行支队","number":"88","zhanbi":"0.8%"},{"name":"宝山支队","number":"83","zhanbi":"0.7%"},'
+ shuju+='{"name":"徐汇支队","number":"133","zhanbi":"2.1%"},{"name":"长宁支队","number":"122","zhanbi":"1.6%"},'
+ shuju+='{"name":"嘉定支队","number":"78","zhanbi":"0.6%"},{"name":"松江支队","number":"75","zhanbi":"0.5%"},'
+ shuju+='{"name":"金山支队","number":"65","zhanbi":"0.4%"},{"name":"崇明支队","number":"55","zhanbi":"0.3%"}]'
+ var jsonObj = JSON.parse(shuju);
+ var res = '
'+biaotou+'
'
+ res+='
';
+ res+='';
+ res+='| 名称 | ';
+ res+='数量 | '
+ res+='总占比 | '
+ res+='
'
+ res+='';
+ for(var i=0;i'
+ res+=''+jsonObj[i].number+' | '
+ res+=''+jsonObj[i].zhanbi+' | '
+ }
+
+ res+=''
+ res+='总计 | 1356 | 19% | '
+ res+='
'
+ return res
+ }
+
}
diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts
index 2627003..1bb95a5 100644
--- a/src/app/statistic-analysis/echarts-data.service.ts
+++ b/src/app/statistic-analysis/echarts-data.service.ts
@@ -163,6 +163,46 @@ export class EchartsDataService {
return [pointX, pointY];
}
+
+ tableTooltipNoShow2(point, params, dom, rect, size) {
+ // 鼠标坐标和提示框位置的参考坐标系是：以外层div的左上角那一点为原点，x轴向右，y轴向下
+ // 提示框位置
+ var x = 0; // x坐标位置
+ var y = 0; // y坐标位置
+
+ // 当前鼠标位置
+ var pointX = point[0];
+ var pointY = point[1];
+
+ // 外层div大小
+ var viewWidth = size.viewSize[0];
+ // var viewHeight = size.viewSize[1];
+
+ // 提示框大小
+ var boxWidth = size.contentSize[0];
+ var boxHeight = size.contentSize[1];
+
+ // boxWidth > pointX 说明鼠标左边放不下提示框
+ if (boxWidth > pointX) {
+ x = 35;
+ } else { // 左边放的下
+ x = pointX + 80;
+ }
+ // 说明鼠标右边放不下提示框
+ if(viewWidth - 100 - pointX < boxWidth){
+ x = pointX - boxWidth;
+ }
+
+
+ // boxHeight > pointY 说明鼠标上边放不下提示框
+ if (boxHeight > pointY) {
+ y = 65;
+ } else { // 上边放得下
+ y = pointY - boxHeight;
+ }
+
+ return [x, y];
+ }
//用法：
// tooltip: {
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 04760c0..781f3f7 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,11 +4,10 @@
* @Author: sueRimn
* @Date: 2020-09-01 15:24:39
* @LastEditors: sueRimn
- * @LastEditTime: 2020-09-02 15:11:35
+ * @LastEditTime: 2020-09-02 16:52:44
*/
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
-//import * as echarts from '';
declare var echarts: any;
@Component({
@@ -26,12 +25,17 @@ export class PageOneComponent implements OnInit {
this.initCharts()
},0)
}
+ ngOnDestroy(): void {
+ this.indexBzt.clear()
+ this.indexBzt.dispose()
+ }
/* 饼状图跳转 */
/* 首页饼状图 */
+ indexBzt
initCharts(){
var ec = echarts as any;
- var indexBzt = ec.init(document.getElementById('indexBzt'));
+ this.indexBzt = ec.init(document.getElementById('indexBzt'));
var options={
title: {
text: '预案状态统计（7005家）',
@@ -97,10 +101,10 @@ export class PageOneComponent implements OnInit {
}
]
};
- indexBzt.on('click', (params) => {
+ this.indexBzt.on('click', (params) => {
this.router.navigateByUrl('/statisticanalysis/statePageTwo_time');
});
- indexBzt.setOption(options);
+ this.indexBzt.setOption(options);
}
/**
* @name: 表格提示框封装
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 ac56a0b..12d64cd 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
@@ -15,7 +15,6 @@ export class PageTwoNameComponent implements OnInit {
@ViewChild('zhongDuiChild') zhongDuiChild:PageZhongDuiDetailsComponent; //父组件中获得子组件的引用
ngOnInit(): void {
-
setTimeout(() => {
this.planState()
this.planAdd()
@@ -24,7 +23,27 @@ export class PageTwoNameComponent implements OnInit {
this.planBack()
this.planAudit()
}, 0);
-
+ }
+
+ ngOnDestroy(): void {
+ this.addEchart.clear()
+ this.addEchart.dispose()
+
+ this.passPlanEchartObj.clear()
+ this.passPlanEchartObj.dispose()
+
+ this.passMakeEchart.clear()
+ this.passMakeEchart.dispose()
+
+ this.passBackEchart.clear()
+ this.passBackEchart.dispose()
+
+ this.planAuditEchart.clear()
+ this.planAuditEchart.dispose()
+
+ this.topEchart.clear()
+ this.topEchart.dispose()
+
}
axisLabel = {
interval: 0,
@@ -65,10 +84,11 @@ export class PageTwoNameComponent implements OnInit {
zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
+ addEchart
//预案新增统计
planAdd () {
let _this = this
- var addEchart = echarts.init(document.getElementById('addEchart'));
+ this.addEchart = echarts.init(document.getElementById('addEchart'));
var option = {
title: {
text: "预案新增",
@@ -107,16 +127,17 @@ export class PageTwoNameComponent implements OnInit {
label: this.topTextlabel
}]
};
- addEchart.setOption(option);
- addEchart.on('click', function (params) {
+ this.addEchart.setOption(option);
+ this.addEchart.on('click', function (params) {
_this.data.statefulInspectionName = '预案新增'
_this.data.statefulInspectionToggle = false
});
}
+ passPlanEchartObj
//预案审核通过
passPlanEchart (){
let _this = this
- var passPlanEchart = echarts.init(document.getElementById('passPlanEchart'));
+ this.passPlanEchartObj = echarts.init(document.getElementById('passPlanEchart'));
var option = {
title: {
text: "预案审核通过",
@@ -154,17 +175,17 @@ export class PageTwoNameComponent implements OnInit {
label: this.topTextlabel
}]
};
- passPlanEchart.setOption(option);
- passPlanEchart.on('click', function (params) {
+ this.passPlanEchartObj.setOption(option);
+ this.passPlanEchartObj.on('click', function (params) {
_this.data.statefulInspectionName = '预案审核通过'
_this.data.statefulInspectionToggle = false
});
}
-
+ passMakeEchart
//预案编制
planMake (){
let _this = this
- var passMakeEchart = echarts.init(document.getElementById('planMake'));
+ this.passMakeEchart = echarts.init(document.getElementById('planMake'));
var option = {
title: {
text: "预案编制",
@@ -202,17 +223,17 @@ export class PageTwoNameComponent implements OnInit {
label: this.topTextlabel
}]
};
- passMakeEchart.setOption(option);
- passMakeEchart.on('click', function (params) {
+ this.passMakeEchart.setOption(option);
+ this.passMakeEchart.on('click', function (params) {
_this.data.statefulInspectionName = '预案编制'
_this.data.statefulInspectionToggle = false
});
}
-
+ passBackEchart
//预案审核退回
planBack (){
let _this = this
- var passBackEchart = echarts.init(document.getElementById('planBack'));
+ this.passBackEchart = echarts.init(document.getElementById('planBack'));
var option = {
title: {
text: "预案审核退回",
@@ -250,17 +271,17 @@ export class PageTwoNameComponent implements OnInit {
label: this.topTextlabel
}]
};
- passBackEchart.setOption(option);
- passBackEchart.on('click', function (params) {
+ this.passBackEchart.setOption(option);
+ this.passBackEchart.on('click', function (params) {
_this.data.statefulInspectionName = '预案审核退回'
_this.data.statefulInspectionToggle = false
});
}
-
+ planAuditEchart
//预案审核中
planAudit (){
let _this = this
- var planAuditEchart = echarts.init(document.getElementById('planAudit'));
+ this.planAuditEchart = echarts.init(document.getElementById('planAudit'));
var option = {
title: {
text: "预案审核中",
@@ -298,16 +319,16 @@ export class PageTwoNameComponent implements OnInit {
label: this.topTextlabel
}]
};
- planAuditEchart.setOption(option);
- planAuditEchart.on('click', function (params) {
+ this.planAuditEchart.setOption(option);
+ this.planAuditEchart.on('click', function (params) {
_this.data.statefulInspectionName = '预案审核中'
_this.data.statefulInspectionToggle = false
});
}
-
+ topEchart
//预案状态统计
planState(){
- var passPlanEchart = echarts.init(document.getElementById('pie'));
+ this.topEchart = echarts.init(document.getElementById('pie'));
var option = {
title: {
text: '预案状态统计（7005份）',
@@ -397,7 +418,7 @@ export class PageTwoNameComponent implements OnInit {
}
]
}
- passPlanEchart.setOption(option);
+ this.topEchart.setOption(option);
}
tableTooltip(biaotou:string){
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 11ad4ac..9ee875a 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
@@ -19,9 +19,13 @@ export class PageZhongDuiDetailsComponent implements OnInit {
this.detailEcharts()
})
}
-
+ ngOnDestroy(): void {
+ this.detailPlanEchart.clear()
+ this.detailPlanEchart.dispose()
+ }
+ detailPlanEchart
detailEcharts(){
- var detailPlanEchart = echarts.init(document.getElementById('detailBox'));
+ this.detailPlanEchart = echarts.init(document.getElementById('detailBox'));
var option = {
title: {
text: this.data.statefulInspectionName,
@@ -53,10 +57,11 @@ export class PageZhongDuiDetailsComponent implements OnInit {
showBackground: true,
backgroundStyle: {
color: 'rgba(220, 220, 220, 0.8)'
- }
+ },
+ barWidth :'58'
}]
};
- detailPlanEchart.setOption(option);
+ this.detailPlanEchart.setOption(option);
}
diff --git a/src/app/statistic-analysis/statistic-analysis-routing.module.ts b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
index f9dd83c..41f9e22 100644
--- a/src/app/statistic-analysis/statistic-analysis-routing.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: sueRimn
+ * @Date: 2020-09-02 16:57:00
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-09-04 15:55:53
+ */
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { PageOneComponent } from './state/page-one/page-one.component';
@@ -17,11 +25,17 @@ import { AddUnitOneComponent } from './addUnit/add-unit-one/add-unit-one.compone
import { AddUnitTwoTypeStatisticsComponent } from './addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component';
import { AddUnitTwoTypeDetailsComponent } from './addUnit/add-unit-two-type-details/add-unit-two-type-details.component';
import { AddUnitTwoTimeComponent } from './addUnit/add-unit-two-time/add-unit-two-time.component';
+import { AddUnitThreeLineDetailsComponent } from './addUnit/add-unit-three-line-details/add-unit-three-line-details.component';
+import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component';
const routes: Routes = [
{ path: 'statePageOne', component: PageOneComponent},
{ path: 'statePageTwo_time', component: PageTwoTimeComponent},
{ path: 'delete_one', component: DeleteOneComponent},
+ { path: 'delete_one/delete_two', component: DeleteTwoComponent},
+ { path: 'delete_one/delete_there/:headtext/:datayuex', component: DeleteThereComponent},
+ { path: 'delete_one/delete_four', component: DeleteFourComponent},
+ { path: 'buildingType_one', component: BuildingTypeOneComponent},
{ path: 'delete_two', component: DeleteTwoComponent},
{ path: 'delete_there', component: DeleteThereComponent},
{ path: 'delete_four', component: DeleteFourComponent},
@@ -33,6 +47,9 @@ const routes: Routes = [
{ path: 'addUnit_one/addUnit_two_type', component: AddUnitTwoTypeStatisticsComponent},
{ path: 'addUnit_one/addUnit_two_typeDetails', component: AddUnitTwoTypeDetailsComponent},
{ path: 'addUnit_one/addUnit_two_time', component: AddUnitTwoTimeComponent},
+ { path: 'addUnit_one/addUnit_two_time/three_lineDetails', component: AddUnitThreeLineDetailsComponent},
+ { path: 'addUnit_one/addUnit_two_time/three_barDetails', component: AddUnitThreeBarDetailsComponent},
+ { path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
{ path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
{ path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent}
];
diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts
index 89ad034..2e37fef 100644
--- a/src/app/statistic-analysis/statistic-analysis.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis.module.ts
@@ -60,11 +60,13 @@ import { AddUnitOneComponent } from './addUnit/add-unit-one/add-unit-one.compone
import { AddUnitTwoTypeStatisticsComponent } from './addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component';
import { AddUnitTwoTypeDetailsComponent } from './addUnit/add-unit-two-type-details/add-unit-two-type-details.component';
import { AddUnitTwoTimeComponent } from './addUnit/add-unit-two-time/add-unit-two-time.component';
+import { AddUnitThreeLineDetailsComponent } from './addUnit/add-unit-three-line-details/add-unit-three-line-details.component';
+import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component';
@NgModule({
- declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent],
+ declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent],
imports: [
CommonModule,
StatisticAnalysisRoutingModule,