From 6593b8930e60dbc5b4d9601ef31cfedc084e9d2b Mon Sep 17 00:00:00 2001 From: jongbowen <970029315@qq.com> Date: Mon, 15 May 2023 16:46:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examStatistics/echarts/echarts.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.scss b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.scss index 4986823..457f008 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.scss +++ b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.scss @@ -51,7 +51,7 @@ } #zhidui{ width: 100%; - height: 80%; + height: 82%; // margin-top: -60px; // position: absolute; // top: 100px; From 381acc3920727a990b0d7d51f550d2213ea15866 Mon Sep 17 00:00:00 2001 From: jongbowen <970029315@qq.com> Date: Mon, 15 May 2023 16:53:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../echarts/echarts.component.ts | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts index 51c9979..f5998ff 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts @@ -34,8 +34,9 @@ export class EchartsComponent implements OnInit { "崇左支队", ], frequency: [18, 17, 14, 14, 12, 11, 15, 13, 12, 16, 16, 13, 18, 17, 12], - number:[180, 170, 140, 140, 120, 110, 150, 130, 120, 160, 160, 130, 180, 170, 120] - + number: [ + 180, 170, 140, 140, 120, 110, 150, 130, 120, 160, 160, 130, 180, 170, 120, + ], }; zhiData2 = { name: [ @@ -55,8 +56,9 @@ export class EchartsComponent implements OnInit { "崇左支队", ], frequency: [18, 17, 14, 14, 12, 11, 15, 13, 12, 16, 16, 13, 18, 17, 12], - number:[180, 170, 140, 140, 120, 110, 150, 130, 120, 160, 160, 130, 180, 170, 120] - + number: [ + 180, 170, 140, 140, 120, 110, 150, 130, 120, 160, 160, 130, 180, 170, 120, + ], }; daData = { name: [ @@ -80,15 +82,15 @@ export class EchartsComponent implements OnInit { frequency: [2, 3, 1, 1, 2, 1, 0, 1, 1, 0, 2, 0, 0, 1, 0], number: [30, 30, 10, 10, 20, 10, 0, 10, 10, 0, 20, 0, 0, 10, 0], }; - + jiuData = { - name:[ + name: [ "南宁市青秀区仙葫消防救援站", "南宁市青秀区凤岭消防救援站", "南宁市青秀区柳沙消防救援站", ], - frequency:[1, 1, 1], - number:[8, 11, 11] + frequency: [1, 1, 1], + number: [8, 11, 11], }; staticExam = false; //考试统计 @@ -117,20 +119,25 @@ export class EchartsComponent implements OnInit { this.examinationIndex = true; this.color = "#FF8678"; } + let myChart = echarts.init(document.getElementById("zhidui")); + myChart.clear(); this.initCharts(); } //后退 - level=0 - back(){ - if(this.level!=0){ - if(this.level==1){ - this.zhiData=this.zhiData2 - - }else{ - this.zhiData=this.daData + level = 0; + back() { + if (this.level != 0) { + if (this.level == 1) { + this.zhiData = this.zhiData2; + let myChart = echarts.init(document.getElementById("zhidui")); + myChart.clear(); + } else { + this.zhiData = this.daData; + let myChart = echarts.init(document.getElementById("zhidui")); + myChart.clear(); } - this.initCharts() - this.level=this.level-1 + this.initCharts(); + this.level = this.level - 1; } } initCharts() { @@ -183,15 +190,17 @@ export class EchartsComponent implements OnInit { }, show: true, }, - grid: { - left: '5%', - right: '5%', - bottom: '1%', - containLabel: true - } , + grid: { + left: "5%", + right: "5%", + bottom: "1%", + containLabel: true, + }, series: [ { - data: this.examinationIndex?this.zhiData.number: this.zhiData.frequency, + data: this.examinationIndex + ? this.zhiData.number + : this.zhiData.frequency, type: "bar", // showBackground: true, backgroundStyle: { @@ -224,14 +233,17 @@ export class EchartsComponent implements OnInit { } clickFunc(e) { console.log(e); + let myChart = echarts.init(document.getElementById("zhidui")); if (e.name.indexOf("支队") != -1) { this.zhiData = this.daData; - this.level=1 + this.level = 1; + myChart.clear(); this.initCharts(); } else if (e.name.indexOf("大队") != -1) { this.zhiData = this.jiuData; - this.level=2 + this.level = 2; + myChart.clear(); this.initCharts(); } else { window.open("home/statistic-examination/station-examinee"); From 89d9445073b61b3de0b2bb46daffaa397cbb62f5 Mon Sep 17 00:00:00 2001 From: jongbowen <970029315@qq.com> Date: Mon, 15 May 2023 16:55:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examStatistics/echarts/echarts.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts index f5998ff..941f008 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts @@ -120,7 +120,7 @@ export class EchartsComponent implements OnInit { this.color = "#FF8678"; } let myChart = echarts.init(document.getElementById("zhidui")); - myChart.clear(); + myChart.dispose(); this.initCharts(); } //后退 @@ -238,12 +238,12 @@ export class EchartsComponent implements OnInit { if (e.name.indexOf("支队") != -1) { this.zhiData = this.daData; this.level = 1; - myChart.clear(); + myChart.dispose(); this.initCharts(); } else if (e.name.indexOf("大队") != -1) { this.zhiData = this.jiuData; this.level = 2; - myChart.clear(); + myChart.dispose(); this.initCharts(); } else { window.open("home/statistic-examination/station-examinee");