From 8037d3ce184f2eb9424dece6fae0015044c1c80a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 2 Sep 2020 15:30:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=A2=84=E6=A1=88?=
=?UTF-8?q?=E7=8A=B6=E6=80=81name=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../state/page-one/page-one.component.ts | 46 +++++++--------
.../page-two-name/page-two-name.component.ts | 58 ++++++++++++-------
2 files changed, 58 insertions(+), 46 deletions(-)
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 5a5710b..d4936b2 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
@@ -47,14 +47,12 @@ export class PageOneComponent implements OnInit {
},
tooltip: {
trigger: 'item',
- formatter: (params)=>{
- //console.log(params)
+ formatter: (params)=>{
return this.biaogeTishi(params.name)
- } ,
+ } ,
backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
borderWidth:'1',
- borderRadius :'0'
-
+ borderRadius :'0'
},
legend: {
orient: 'vertical',
@@ -101,9 +99,7 @@ export class PageOneComponent implements OnInit {
]
};
indexBzt.on('click', (params) => {
- console.log(999)
this.router.navigateByUrl('/statisticanalysis/statePageTwo_time');
- // this.router.navigate(["/statisticanalysis/statePageTwo_time"])
});
indexBzt.setOption(options);
}
@@ -125,24 +121,24 @@ export class PageOneComponent implements OnInit {
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+='
';
+ res+='';
+ res+='| 名称 | ';
+ res+='数量 | '
+ res+='总占比 | '
+ res+='
'
+ res+='';
+ for(var i=0;i'
+ res+=''+jsonObj[i].number+' | '
+ res+=''+jsonObj[i].zhanbi+' | '
+ }
+
+ res+=''
+ res+='总计 | 1356 | 19% | '
+ res+='
预案补充'
- res+='
';
- res+='';
- res+='| 名称 | ';
- res+='数量 | '
- res+='总占比 | '
- res+='
'
- res+='';
- // console.log(jsonObj)
- for(var i=0;i'
- res+=''+jsonObj[i].number+' | '
- res+=''+jsonObj[i].zhanbi+' | '
- }
- res+=''
- res+='
'
- return res
- }
-
+ formatter: (params)=>{
+ return this.tableTooltip(params.name)
+ } ,
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0'
},
legend: {
orient: 'vertical',
@@ -335,4 +320,35 @@ export class PageTwoNameComponent implements OnInit {
}
passPlanEchart.setOption(option);
}
+
+ tableTooltip(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+='
'+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+='
'+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+='
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
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.spec.ts b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.spec.ts
new file mode 100644
index 0000000..fdb96de
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteFourComponent } from './delete-four.component';
+
+describe('DeleteFourComponent', () => {
+ let component: DeleteFourComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DeleteFourComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DeleteFourComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..95cb56e
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-delete-four',
+ templateUrl: './delete-four.component.html',
+ styleUrls: ['./delete-four.component.scss']
+})
+export class DeleteFourComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
new file mode 100644
index 0000000..34c9ac1
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
@@ -0,0 +1,9 @@
+
+
diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.scss b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.spec.ts b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.spec.ts
new file mode 100644
index 0000000..6d1f251
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteOneComponent } from './delete-one.component';
+
+describe('DeleteOneComponent', () => {
+ let component: DeleteOneComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DeleteOneComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DeleteOneComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..abd6625
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts
@@ -0,0 +1,148 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: sueRimn
+ * @Date: 2020-09-01 15:24:39
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-09-02 16:30:02
+ */
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+//import * as echarts from '';
+declare var echarts: any;
+
+@Component({
+ selector: 'app-page-one',
+ templateUrl: './page-one.component.html',
+ styleUrls: ['./page-one.component.scss']
+})
+export class PageOneComponent implements OnInit {
+ options:any;
+
+
+ constructor(private router: Router) { }
+
+ 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: '预案状态统计（7005家）',
+ //subtext: '纯属虚构',
+ padding:[80,100],
+ left: 'center',
+ textStyle:{
+ fontSize:38
+ }
+ },
+ tooltip: {
+ trigger: 'item',
+ formatter: (params)=>{
+ //console.log(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: 1585, name: '预案新增'},
+ {value: 2000, name: '预案审核通过',itemStyle:{color:'#02A7F0'}},
+ {value: 2600, name: '预案编制'},
+ {value: 1500, name: '预案审核退回'},
+ {value: 1800, name: '预案审核中'}
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+ indexBzt.on('click', (params) => {
+ console.log(999)
+ this.router.navigateByUrl('/statisticanalysis/statePageTwo_time');
+ // this.router.navigate(["/statisticanalysis/statePageTwo_time"])
+ });
+ 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+='
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
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.spec.ts b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.spec.ts
new file mode 100644
index 0000000..a171b9c
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteThereComponent } from './delete-there.component';
+
+describe('DeleteThereComponent', () => {
+ let component: DeleteThereComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DeleteThereComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DeleteThereComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..d8963ed
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-delete-there',
+ templateUrl: './delete-there.component.html',
+ styleUrls: ['./delete-there.component.scss']
+})
+export class DeleteThereComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
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
new file mode 100644
index 0000000..de3a6f2
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.spec.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.spec.ts
new file mode 100644
index 0000000..fae769f
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteTwoComponent } from './delete-two.component';
+
+describe('DeleteTwoComponent', () => {
+ let component: DeleteTwoComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DeleteTwoComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DeleteTwoComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..52b6ee5
--- /dev/null
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-delete-two',
+ templateUrl: './delete-two.component.html',
+ styleUrls: ['./delete-two.component.scss']
+})
+export class DeleteTwoComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts
index 6046aca..7045fd0 100644
--- a/src/app/statistic-analysis/statistic-analysis.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis.module.ts
@@ -47,10 +47,14 @@ import {MatToolbarModule} from '@angular/material/toolbar';
import {MatTooltipModule} from '@angular/material/tooltip';
import {MatTreeModule} from '@angular/material/tree';
import { PageZhongDuiDetailsComponent } from './state/page-zhong-dui-details/page-zhong-dui-details.component';
+import { DeleteOneComponent } from './deleteUnit/delete-one/delete-one.component';
+import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component';
+import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
+import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
@NgModule({
- declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent],
+ declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent],
imports: [
CommonModule,
StatisticAnalysisRoutingModule,
From 39282e90073b831e5f2ce5f495b9211fe870554f Mon Sep 17 00:00:00 2001
From: chenjingyu
Date: Wed, 2 Sep 2020 16:38:36 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deleteUnit/delete-one/delete-one.component.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 abd6625..4acd8a0 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
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-01 15:24:39
* @LastEditors: sueRimn
- * @LastEditTime: 2020-09-02 16:30:02
+ * @LastEditTime: 2020-09-02 16:37:52
*/
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
@@ -27,7 +27,6 @@ export class PageOneComponent implements OnInit {
this.initCharts()
},0)
}
- /* 饼状图跳转 */
/* 首页饼状图 */
initCharts(){
From 0a5fa2a25dc66543a4b6945ef757bf8182f24cd1 Mon Sep 17 00:00:00 2001
From: chenjingyu
Date: Wed, 2 Sep 2020 16:45:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E3=80=91ts=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../delete-one/delete-one.component.ts | 140 +-----------------
1 file changed, 8 insertions(+), 132 deletions(-)
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 4acd8a0..3169f9b 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
@@ -2,146 +2,22 @@
* @Descripttion:
* @version:
* @Author: sueRimn
- * @Date: 2020-09-01 15:24:39
+ * @Date: 2020-09-02 16:15:53
* @LastEditors: sueRimn
- * @LastEditTime: 2020-09-02 16:37:52
+ * @LastEditTime: 2020-09-02 16:44:32
*/
import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-//import * as echarts from '';
-declare var echarts: any;
@Component({
- selector: 'app-page-one',
- templateUrl: './page-one.component.html',
- styleUrls: ['./page-one.component.scss']
+ selector: 'app-delete-one',
+ templateUrl: './delete-one.component.html',
+ styleUrls: ['./delete-one.component.scss']
})
-export class PageOneComponent implements OnInit {
- options:any;
-
-
- constructor(private router: Router) { }
+export class DeleteOneComponent implements OnInit {
- ngOnInit() {
- window.setTimeout(()=>{
- this.initCharts()
- },0)
- }
+ constructor() { }
- /* 首页饼状图 */
- initCharts(){
- //console.log(document.getElementById('indexBzt'))
-
- var ec = echarts as any;
- var indexBzt = ec.init(document.getElementById('indexBzt'));
- var options={
- title: {
- text: '预案状态统计（7005家）',
- //subtext: '纯属虚构',
- padding:[80,100],
- left: 'center',
- textStyle:{
- fontSize:38
- }
- },
- tooltip: {
- trigger: 'item',
- formatter: (params)=>{
- //console.log(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: 1585, name: '预案新增'},
- {value: 2000, name: '预案审核通过',itemStyle:{color:'#02A7F0'}},
- {value: 2600, name: '预案编制'},
- {value: 1500, name: '预案审核退回'},
- {value: 1800, name: '预案审核中'}
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- indexBzt.on('click', (params) => {
- console.log(999)
- this.router.navigateByUrl('/statisticanalysis/statePageTwo_time');
- // this.router.navigate(["/statisticanalysis/statePageTwo_time"])
- });
- 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+='
building-type-one works!
diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.scss b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.spec.ts b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.spec.ts
new file mode 100644
index 0000000..1c4d4e3
--- /dev/null
+++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BuildingTypeOneComponent } from './building-type-one.component';
+
+describe('BuildingTypeOneComponent', () => {
+ let component: BuildingTypeOneComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ BuildingTypeOneComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(BuildingTypeOneComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..b475080
--- /dev/null
+++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-building-type-one',
+ templateUrl: './building-type-one.component.html',
+ styleUrls: ['./building-type-one.component.scss']
+})
+export class BuildingTypeOneComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/src/app/statistic-analysis/statistic-analysis-routing.module.ts b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
index c4ce8e0..1bbcbfb 100644
--- a/src/app/statistic-analysis/statistic-analysis-routing.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
@@ -4,12 +4,20 @@ import { PageOneComponent } from './state/page-one/page-one.component';
import { PageTwoNameComponent } from './state/page-two-name/page-two-name.component';
import { PageTwoTimeComponent } from './state/page-two-time/page-two-time.component';
import { PageZhongDuiDetailsComponent } from './state/page-zhong-dui-details/page-zhong-dui-details.component';
+import { DeleteOneComponent } from './deleteUnit/delete-one/delete-one.component';
+import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component';
+import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
+import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
+import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
const routes: Routes = [
{ path: 'statePageOne', component: PageOneComponent},
{ path: 'statePageTwo_time', component: PageTwoTimeComponent},
- { path: 'statePageTwo_name', component: PageTwoNameComponent},
- { path: 'statePageTwo_details', component: PageZhongDuiDetailsComponent}
+ { path: 'delete_one', component: DeleteOneComponent},
+ { path: 'delete_two', component: DeleteTwoComponent},
+ { path: 'delete_there', component: DeleteThereComponent},
+ { path: 'delete_four', component: DeleteFourComponent},
+ { path: 'buildingType_one', component: BuildingTypeOneComponent}
];
@NgModule({
diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts
index 7045fd0..1b226ed 100644
--- a/src/app/statistic-analysis/statistic-analysis.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis.module.ts
@@ -51,10 +51,11 @@ import { DeleteOneComponent } from './deleteUnit/delete-one/delete-one.component
import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component';
import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
+import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
@NgModule({
- declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent],
+ declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent],
imports: [
CommonModule,
StatisticAnalysisRoutingModule,