Merge branch 'guangxi' of http://121.36.37.70:3000/shaojiahao/examSystem-Anxin into guangxi

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;

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],
+    frequency: [1, 1, 1],
-    number:[8, 11, 11]
+    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.dispose();
     this.initCharts();
   }
   //后退
-  level=0
+  level = 0;
-  back(){
+  back() {
-    if(this.level!=0){
+    if (this.level != 0) {
-      if(this.level==1){
+      if (this.level == 1) {
-        this.zhiData=this.zhiData2
+        this.zhiData = this.zhiData2;
-        
+        let myChart = echarts.init(document.getElementById("zhidui"));
-      }else{
+        myChart.clear();
-        this.zhiData=this.daData
+      } else {
+        this.zhiData = this.daData;
+        let myChart = echarts.init(document.getElementById("zhidui"));
+        myChart.clear();
       }
-      this.initCharts()
+      this.initCharts();
-      this.level=this.level-1
+      this.level = this.level - 1;
     }
   }
   initCharts() {
@@ -183,15 +190,17 @@ export class EchartsComponent implements OnInit {
         },
         show: true,
       },
-      grid: {  
+      grid: {
-        left: '5%',  
+        left: "5%",
-        right: '5%',  
+        right: "5%",
-       bottom: '1%',  
+        bottom: "1%",
-       containLabel: true  
+        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.dispose();
       this.initCharts();
     } else if (e.name.indexOf("大队") != -1) {
       this.zhiData = this.jiuData;
-      this.level=2
+      this.level = 2;
+      myChart.dispose();
       this.initCharts();
     } else {
       window.open("home/statistic-examination/station-examinee");