@@ -32,8 +32,8 @@
diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
index 63958b7..b26dd39 100644
--- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
+++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
@@ -3,6 +3,8 @@ import { MatDatepickerInputEvent } from '@angular/material/datepicker';
import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
import { FormControl } from '@angular/forms';
import { DateAdapter } from '@angular/material/core';
+import { PageTwoNameComponent } from '../page-two-name/page-two-name.component';
+import {EchartsDataService} from '../../echarts-data.service'
declare var echarts: any;
@Component({
@@ -12,28 +14,34 @@ declare var echarts: any;
})
export class PageTwoTimeComponent implements OnInit {
- constructor(public snackBar: MatSnackBar,private adapter: DateAdapter
,) { }
+ constructor(public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService) { }
- @ViewChild('echarts') echarts:echartsComponent; //父组件中获得子组件的引用
+ @ViewChild('appEcharts')appEcharts :echartsComponent; //父组件中获得子组件的引用
+ @ViewChild('pageTwoName')pageTwoName :PageTwoNameComponent; //父组件中获得子组件的引用
ngOnInit(): void {
- this.startTime = new FormControl( (new Date()).getFullYear()+ '-' + '01' + '-' + '01' )
- this.endTime = new FormControl( new Date() )
+ this.startTime = new FormControl( (new Date()).getFullYear()-10 )
+ this.endTime = new FormControl( (new Date()).getFullYear() )
this.adapter.setLocale('CH')
}
isQuery:boolean = true; //横纵向查询
+ //查询
query () {
- this.echarts.toggleEcharts()
+
}
+ //shao
toggleTrue () {
this.isQuery = true
+ this.echartsData.statefulInspectionToggle = true
}
+ //chen
toggleFalse () {
this.isQuery = false
+ this.echartsData.statefulInspectionToggle = true
}
startTime:any; //查询开始时间
@@ -95,7 +103,7 @@ export class PageTwoTimeComponent implements OnInit {
})
export class echartsComponent implements OnInit {
- constructor(public snackBar: MatSnackBar,private adapter: DateAdapter,) { }
+ constructor(public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService) { }
ngOnInit(): void {
window.setTimeout(()=>{
@@ -108,11 +116,7 @@ export class echartsComponent implements OnInit {
},0)
}
- toggle:boolean = true;//切换
- toggleEcharts () {
- this.toggle = !this.toggle
- }
oneInit () {
var chartQusj = echarts.init(document.getElementById('one'), 'skinUpp');
@@ -191,6 +195,7 @@ export class echartsComponent implements OnInit {
}
twoInit () {
+ let that = this
var chartQusj = echarts.init(document.getElementById('two'), 'skinUpp');
var option = {
grid: {
@@ -257,9 +262,14 @@ export class echartsComponent implements OnInit {
],
};
chartQusj.setOption(option);
+ chartQusj.on('click', function (params) {
+ that.echartsData.statefulInspectionName = '预案新增'
+ that.echartsData.statefulInspectionToggle = false
+ });
}
threeInit () {
+ let that = this
var chartQusj = echarts.init(document.getElementById('three'), 'skinUpp');
var option = {
grid: {
@@ -326,9 +336,14 @@ export class echartsComponent implements OnInit {
],
};
chartQusj.setOption(option);
+ chartQusj.on('click', function (params) {
+ that.echartsData.statefulInspectionName = '预案审核通过'
+ that.echartsData.statefulInspectionToggle = false
+ });
}
fourInit () {
+ let that = this
var chartQusj = echarts.init(document.getElementById('four'), 'skinUpp');
var option = {
grid: {
@@ -395,9 +410,14 @@ export class echartsComponent implements OnInit {
],
};
chartQusj.setOption(option);
+ chartQusj.on('click', function (params) {
+ that.echartsData.statefulInspectionName = '预案编制'
+ that.echartsData.statefulInspectionToggle = false
+ });
}
fiveInit () {
+ let that = this
var chartQusj = echarts.init(document.getElementById('five'), 'skinUpp');
var option = {
grid: {
@@ -464,9 +484,14 @@ export class echartsComponent implements OnInit {
],
};
chartQusj.setOption(option);
+ chartQusj.on('click', function (params) {
+ that.echartsData.statefulInspectionName = '预案审核退回'
+ that.echartsData.statefulInspectionToggle = false
+ });
}
sixInit () {
+ let that = this
var chartQusj = echarts.init(document.getElementById('six'), 'skinUpp');
var option = {
grid: {
@@ -533,6 +558,10 @@ export class echartsComponent implements OnInit {
],
};
chartQusj.setOption(option);
+ chartQusj.on('click', function (params) {
+ that.echartsData.statefulInspectionName = '预案审核中'
+ that.echartsData.statefulInspectionToggle = false
+ });
}
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 3/4] =?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+='