From c64eef9e1be658ae9d937153e7dbdecb994d6a1e Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Wed, 2 Sep 2020 16:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.module.ts | 4 +- .../delete-four/delete-four.component.html | 1 + .../delete-four/delete-four.component.scss | 0 .../delete-four/delete-four.component.spec.ts | 25 +++ .../delete-four/delete-four.component.ts | 15 ++ .../delete-one/delete-one.component.html | 9 ++ .../delete-one/delete-one.component.scss | 0 .../delete-one/delete-one.component.spec.ts | 25 +++ .../delete-one/delete-one.component.ts | 148 ++++++++++++++++++ .../delete-there/delete-there.component.html | 1 + .../delete-there/delete-there.component.scss | 0 .../delete-there.component.spec.ts | 25 +++ .../delete-there/delete-there.component.ts | 15 ++ .../delete-two/delete-two.component.html | 1 + .../delete-two/delete-two.component.scss | 0 .../delete-two/delete-two.component.spec.ts | 25 +++ .../delete-two/delete-two.component.ts | 15 ++ .../statistic-analysis.module.ts | 6 +- 18 files changed, 313 insertions(+), 2 deletions(-) create mode 100644 src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html create mode 100644 src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss create mode 100644 src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.spec.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html create mode 100644 src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.scss create mode 100644 src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.spec.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html create mode 100644 src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss create mode 100644 src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.spec.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html create mode 100644 src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss create mode 100644 src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.spec.ts create mode 100644 src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3b99be1..441443f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -20,12 +20,14 @@ import { TreeService } from'./http-interceptors/tree.service'; import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥 import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { GISManagementModule } from './gis-management/gis-management.module'; +import { DeleteOneComponent } from './deleteUnit/delete-one/delete-one.component'; @NgModule({ declarations: [ AppComponent, HomeComponent, - MTokenK1Component + MTokenK1Component, + DeleteOneComponent ], imports: [ BrowserModule, 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 new file mode 100644 index 0000000..9799a59 --- /dev/null +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html @@ -0,0 +1 @@ +

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+='' + res+='' + } + + res+='' + res+='' + res+='
名称数量总占比
'+jsonObj[i].number+''+jsonObj[i].zhanbi+'
总计135619%
' + 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 new file mode 100644 index 0000000..0c3246a --- /dev/null +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html @@ -0,0 +1 @@ +

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,