[综合分析]提示框调整及气泡封装

src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts

@@ -28,7 +28,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
 
   ngOnInit(): void {
     this.route.queryParams.subscribe(params => {
-      this.bianli()
+      this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData)
       this.organizationName = params['organizationName'];
       this.buildingTypeName = params['buildingTypeName'];
     });
@@ -53,18 +53,6 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
   zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"]
   zhongNumData = [200,190,180,170,160,150,140,130,120,110,100]
   tiaoshiPao:any
-  //气泡提示数据获取
-  bianli(){
-    var arrshuzu='[';
-    for(var i=0;i<this.zhongNumData.length;i++){
-      arrshuzu+='{"value":'+this.zhongNumData[i]+',"coord":['+i+','+this.zhongNumData[i]+'],"name":'+'"'+this.zhongNameData[i]+'"'+'},'
-    }
-    arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
-    arrshuzu+=']'
-    this.tiaoshiPao=JSON.parse(arrshuzu)
-    console.log(this.tiaoshiPao)
-    //return tishiPao
-  }
   detailPlanEchart
   detailEcharts(){
     this.detailPlanEchart = echarts.init(document.getElementById('barEchart'),'walden');  
@@ -104,8 +92,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.tableTooltip(params)
-        },
-        position: this.echartsData.tableTooltipNoShow2
+        }
       },
       series: [{
           data: this.zhongNumData,

src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts

@@ -18,7 +18,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
   }
   ngOnInit(): void {
     window.setTimeout(()=>{
-      this.bianli()
+      this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData)
       this.initCharts()
       this.barEcharts()
     },0)
@@ -262,8 +262,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
           trigger: 'item',
           formatter:  (params)=>{
             return this.tableTooltip(this.tableDataZhong,params.name)
-          },
-          position: this.data.tableTooltipNoShow2
+          }
         },
         series: [{
             data: this.buildingTypeNum,

src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:22:58
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 09:17:32
+ * @LastEditTime: 2020-09-10 14:23:36
  */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
@@ -23,22 +23,10 @@ export class DeleteFourComponent implements OnInit {
   constructor(public route: ActivatedRoute,public data: EchartsDataService,public snackBar: MatSnackBar,private adapter: DateAdapter<any>) { }
   zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"]
   zhongNumData = [200,190,180,170,160,150,140,130,120,110,100]
-  tiaoshiPao:any
-  //气泡提示数据获取
-  bianli(){
-    var arrshuzu='[';
-    for(var i=0;i<this.zhongNumData.length;i++){
-      arrshuzu+='{"value":'+this.zhongNumData[i]+',"coord":['+i+','+this.zhongNumData[i]+'],"name":'+'"'+this.zhongNameData[i]+'"'+'},'
-    }
-    arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
-    arrshuzu+=']'
-    this.tiaoshiPao=JSON.parse(arrshuzu)
-    console.log(this.tiaoshiPao)
-    //return tishiPao
-  }
+  tiaoshiPao:any//气泡传入数据
   level:string;
   ngOnInit(): void {
-    this.bianli()
+    this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData)
     this.route.queryParams.subscribe(param=>{
      this.level=param.level
       //console.log(this.level)

src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts

@@ -42,7 +42,7 @@ export class DeleteOneComponent implements OnInit {
       },
       tooltip: {
           trigger: 'item',
-          position: this.echartsData.tableTooltipNoShow2,
+          //position: this.echartsData.tableTooltipNoShow2,
           formatter:  (params)=>{
             //return this.biaogeTishi(params.name)
             return this.echartsData.biaogeTishi(params.name)

src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:22:35
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 09:16:42
+ * @LastEditTime: 2020-09-10 14:33:07
  */
 import { Component, OnInit } from '@angular/core';
 import { Router,ActivatedRoute } from '@angular/router';
@@ -33,7 +33,7 @@ export class DeleteThereComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.bianli();
+    this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData)
     this.dateInit();
     //let headtext:string;
     let datayuex:string;

src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:21:18
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 10:56:58
+ * @LastEditTime: 2020-09-10 14:31:18
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
@@ -25,6 +25,7 @@ export class DeleteTwoComponent implements OnInit {
   datayuey=[210, 160, 150, 140, 130, 120, 110,120,150];
   datanianx=[2019,2020];
   dataniany=[201,174]
+  tiaoshiPao:any//气泡
 
   constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter<any>,public echartsData:EchartsDataService) { }
   /* @ViewChild('appEcharts')appEcharts :echartsComponent; //父组件中获得子组件的引用
@@ -32,7 +33,8 @@ export class DeleteTwoComponent implements OnInit {
 
   ngOnInit(): void {
     this.dateInit()
-    this.bianli()
+    this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex)
+    //this.bianli()
     window.setTimeout(()=>{
 
       this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey)
@@ -69,19 +71,7 @@ export class DeleteTwoComponent implements OnInit {
 
   zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
   zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
-  tiaoshiPao:any
-  //气泡提示数据获取
-  bianli(){
-    var arrshuzu='[';
-    for(var i=0;i<this.datayuey.length;i++){
-      arrshuzu+='{"value":'+this.datayuey[i]+',"coord":['+i+','+this.datayuey[i]+'],"name":'+'"'+this.datayuex[i]+'"'+'},'
-    }
-    arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
-    arrshuzu+=']'
-    this.tiaoshiPao=JSON.parse(arrshuzu)
-    console.log(this.tiaoshiPao)
-    //return tishiPao
-  }
+  
   
   //查询数据
   years:any = []
@@ -229,7 +219,7 @@ export class DeleteTwoComponent implements OnInit {
         /* backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
         borderWidth:'1',
         borderRadius :'0', */
-        position: this.echartsData.tableTooltipNoShow2
+        position:divid=='Line'? this.echartsData.tableTooltipNoShow2:false
       },
       xAxis: {
           type: 'category',

src/app/statistic-analysis/echarts-data.service.ts

@@ -276,24 +276,24 @@ export class EchartsDataService {
  }
  zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
    zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
-   tiaoshiPao:any;
-   arrshuzu='[';
+
 /**
    * @name: 气泡封装
    * @test: test font
    * @msg: 
-   * @param {}
-   * @return {type} 
+   * @param {气泡提示对象，y轴数据，x轴数据}
+   * @return {json对象} 
    */
-  qipao():any{
-    for(var i=0;i<this.zhiNumData.length;i++){
-      this.arrshuzu+='{"value":'+this.zhiNumData[i]+',"coord":['+i+','+this.zhiNumData[i]+'],"name":'+'"'+this.zhiNameData[i]+'"'+'},'
+  qipao(tiaoshiPao:any,yData,xData):any{
+    var arrshuzu='[';
+    for(var i=0;i<yData.length;i++){
+      arrshuzu+='{"value":'+yData[i]+',"coord":['+i+','+yData[i]+'],"name":'+'"'+xData[i]+'"'+'},'
     }
-    this.arrshuzu=this.arrshuzu.substring(0,this.arrshuzu.length-1)
-    this.arrshuzu+=']'
-    this.tiaoshiPao=JSON.parse(this.arrshuzu)
-    console.log(this.tiaoshiPao)
-    return 't'
+    arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
+    arrshuzu+=']'
+    tiaoshiPao=JSON.parse(arrshuzu)
+    console.log(tiaoshiPao)
+    return tiaoshiPao
   }
 
 }

src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts

@@ -16,7 +16,7 @@ export class PageTwoNameComponent implements OnInit {
 
   ngOnInit(): void {
     setTimeout(() => {
-      this.bianli()
+      this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData)
       this.planState()
       this.planAdd()
       this.passPlanEchart()
@@ -137,8 +137,8 @@ export class PageTwoNameComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.data.biaogeTishi(params.name)
-        },
-        position: this.data.tableTooltipNoShow2
+        }/* ,
+        position: this.data.tableTooltipNoShow2 */
       },
       series: [{
           data: this.zhiNumData,
@@ -193,8 +193,8 @@ export class PageTwoNameComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.data.biaogeTishi(params.name)
-        },
-        position: this.data.tableTooltipNoShow2
+        }/* ,
+        position: this.data.tableTooltipNoShow2 */
       },
       series: [{
           data: this.zhiNumData,
@@ -249,8 +249,8 @@ export class PageTwoNameComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.data.biaogeTishi(params.name)
-        },
-        position: this.data.tableTooltipNoShow2
+        }/* ,
+        position: this.data.tableTooltipNoShow2 */
         
       },
       series: [{
@@ -306,8 +306,8 @@ export class PageTwoNameComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.data.biaogeTishi(params.name)
-        },
-        position: this.data.tableTooltipNoShow2
+        }/* ,
+        position: this.data.tableTooltipNoShow2 */
         
       },
       series: [{
@@ -363,8 +363,8 @@ export class PageTwoNameComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.data.biaogeTishi(params.name)
-        },
-        position: this.data.tableTooltipNoShow2
+        }/* ,
+        position: this.data.tableTooltipNoShow2 */
         
       },
       series: [{

src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@@ -153,7 +153,7 @@ export class echartsComponent implements OnInit {
   }
   ngOnInit(): void {
     window.setTimeout(()=>{
-      this.bianli()
+      this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex)
       this.oneInit()
       this.twoInit()
       this.threeInit()
@@ -340,7 +340,7 @@ export class echartsComponent implements OnInit {
       ],
     };
     this.twoExample.setOption(option);
-    this.twoExample.on('click', function (params) {
+    this.twoExample.getZr().on('click', function (params) {
       that.echartsData.statefulInspectionName = '预案新增'
       that.echartsData.statefulInspectionToggle = false
     });
@@ -423,7 +423,7 @@ export class echartsComponent implements OnInit {
       ],
     };
     this.threeExample.setOption(option);
-    this.threeExample.on('click', function (params) {
+    this.threeExample.getZr().on('click', function (params) {
       that.echartsData.statefulInspectionName = '预案审核通过'
       that.echartsData.statefulInspectionToggle = false
     });
@@ -507,7 +507,7 @@ export class echartsComponent implements OnInit {
       ],
     };
     this.fourExample.setOption(option);
-    this.fourExample.on('click', function (params) {
+    this.fourExample.getZr().on('click', function (params) {
       that.echartsData.statefulInspectionName = '预案编制'
       that.echartsData.statefulInspectionToggle = false
     });
@@ -592,7 +592,7 @@ export class echartsComponent implements OnInit {
       ],
     };
     this.fiveExample.setOption(option);
-    this.fiveExample.on('click', function (params) {
+    this.fiveExample.getZr().on('click', function (params) {
       that.echartsData.statefulInspectionName = '预案审核退回'
       that.echartsData.statefulInspectionToggle = false
     });
@@ -676,7 +676,7 @@ export class echartsComponent implements OnInit {
       ],
     };
     this.sixExample.setOption(option);
-    this.sixExample.on('click', function (params) {
+    this.sixExample.getZr().on('click', function (params) {
       that.echartsData.statefulInspectionName = '预案审核中'
       that.echartsData.statefulInspectionToggle = false
     });

src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-05 13:50:45
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 09:51:32
+ * @LastEditTime: 2020-09-10 14:38:17
  */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
@@ -22,22 +22,9 @@ export class PageZhongDuiDetailsComponent implements OnInit {
   zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"]
   zhongNumData = [200,190,180,170,160,150,140,130,120,110,100]
   tiaoshiPao:any
-  //气泡提示数据获取
-  bianli(){
-    var arrshuzu='[';
-    for(var i=0;i<this.zhongNumData.length;i++){
-      arrshuzu+='{"value":'+this.zhongNumData[i]+',"coord":['+i+','+this.zhongNumData[i]+'],"name":'+'"'+this.zhongNameData[i]+'"'+'},'
-    }
-    arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
-    arrshuzu+=']'
-    this.tiaoshiPao=JSON.parse(arrshuzu)
-    console.log(this.tiaoshiPao)
-    //return tishiPao
-  }
-
   ngOnInit(): void {
     window.setTimeout(()=>{
-      this.bianli()
+      this.tiaoshiPao=this.data.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData)
       this.detailEcharts()
     })
   }
@@ -83,8 +70,7 @@ export class PageZhongDuiDetailsComponent implements OnInit {
         trigger: 'item',
         formatter:  (params)=>{
           return this.tableTooltip(params)
-        },
-        position: this.data.tableTooltipNoShow2
+        }
       },
       series: [{
           data: this.zhongNumData,