[上海统计分析]提示框修改

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

@@ -139,7 +139,6 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
       {value: 966, name: '松江支队'},
       {value: 789, name: '金山支队'},
       {value: 500, name: '崇明支队'},
-      {value: 1025, name: '展览建筑'},
       {value: 600, name: '青浦支队'}
   ]
   buildingTypeName = ['高层','地下','轨道交通','化工生产','储罐类','厂房','古建筑','商市场','医院','学校','宾馆','娱乐场所','餐饮业','影剧院','展览建筑','隧道']

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

@@ -153,7 +153,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
       tooltip: {
         trigger: 'item',
         formatter:  (params)=>{
-          return this.tableTooltip(this.tableDataZhi,params.name)
+          return this.data.tableTooltip(this.tableDataZhi,params.name)
         },
         position: this.data.tableTooltipNoShow2
       },

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

@@ -45,7 +45,7 @@ export class DeleteOneComponent implements OnInit {
           //position: this.echartsData.tableTooltipNoShow2,
           formatter:  (params)=>{
             //return this.biaogeTishi(params.name)
-            return this.echartsData.biaogeTishi(params.name)
+            return this.echartsData.biaogeTishiZhi(params.name)
           } 
       },
       legend: {

src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@@ -439,9 +439,9 @@ export class notVerifiedComponent implements OnInit {
       tooltip: {
         trigger: 'axis',
         formatter:  (params)=>{
-          return this.echartsData.tableTooltip(this.echartsData.tableDataZhi,'未核查')
+          return this.echartsData.tableTooltip(this.echartsData.tableDataZhong,'未核查')
-        }/* ,
+        },
-        position:this.echartsData.tableTooltipNoShow */
+        position:this.echartsData.tableTooltipNoShow2
       },
       legend: {
         data: ['剩余未核查','总数'],

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

@@ -154,10 +154,15 @@ export class PageTwoNameComponent implements OnInit {
       }]
     };
     this.addEchart.setOption(option);
-    this.addEchart.on('click', function (params) {
+    this.addEchart.getZr().on('click', (params) => {
-      _this.data.statefulInspectionName = '预案新增'
+      const pointInPixel= [params.offsetX, params.offsetY];
-      _this.data.statefulInspectionToggle = false
+    if (this.addEchart.containPixel('grid',pointInPixel)) {
-    });
+      let xIndex=this.addEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        /*事件处理代码书写位置*/
+        this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
+    }
+    
+  });
   }
   passPlanEchartObj
   //预案审核通过
@@ -210,10 +215,15 @@ export class PageTwoNameComponent implements OnInit {
       }]
     };
     this.passPlanEchartObj.setOption(option);
-    this.passPlanEchartObj.on('click', function (params) {
+    this.passPlanEchartObj.getZr().on('click', (params) => {
-      _this.data.statefulInspectionName = '预案审核通过'
+      const pointInPixel= [params.offsetX, params.offsetY];
-      _this.data.statefulInspectionToggle = false
+    if (this.passPlanEchartObj.containPixel('grid',pointInPixel)) {
-    });
+      let xIndex=this.passPlanEchartObj.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        /*事件处理代码书写位置*/
+        this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
+    }
+    
+  });
   }
   passMakeEchart
   //预案编制
@@ -267,10 +277,15 @@ export class PageTwoNameComponent implements OnInit {
       }]
     };
     this.passMakeEchart.setOption(option);
-    this.passMakeEchart.on('click', function (params) {
+    this.passMakeEchart.getZr().on('click', (params) => {
-      _this.data.statefulInspectionName = '预案编制'
+      const pointInPixel= [params.offsetX, params.offsetY];
-      _this.data.statefulInspectionToggle = false
+    if (this.passMakeEchart.containPixel('grid',pointInPixel)) {
-    });
+      let xIndex=this.passMakeEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        /*事件处理代码书写位置*/
+        this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
+    }
+    
+  });
   }
   passBackEchart
   //预案审核退回
@@ -324,10 +339,15 @@ export class PageTwoNameComponent implements OnInit {
       }]
     };
     this.passBackEchart.setOption(option);
-    this.passBackEchart.on('click', function (params) {
+    this.passBackEchart.getZr().on('click', (params) => {
-      _this.data.statefulInspectionName = '预案审核退回'
+      const pointInPixel= [params.offsetX, params.offsetY];
-      _this.data.statefulInspectionToggle = false
+    if (this.passBackEchart.containPixel('grid',pointInPixel)) {
-    });
+      let xIndex=this.passBackEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        /*事件处理代码书写位置*/
+        this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
+    }
+    
+  });
   }
   planAuditEchart
   //预案审核中
@@ -381,10 +401,15 @@ export class PageTwoNameComponent implements OnInit {
       }]
     };
     this.planAuditEchart.setOption(option);
-    this.planAuditEchart.on('click', function (params) {
+    this.planAuditEchart.getZr().on('click', (params) => {
-      _this.data.statefulInspectionName = '预案审核中'
+      const pointInPixel= [params.offsetX, params.offsetY];
-      _this.data.statefulInspectionToggle = false
+    if (this.planAuditEchart.containPixel('grid',pointInPixel)) {
-    });
+      let xIndex=this.planAuditEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        /*事件处理代码书写位置*/
+        this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
+    }
+    
+  });
   }
   topEchart
   //预案状态统计
@@ -402,7 +427,7 @@ export class PageTwoNameComponent implements OnInit {
       tooltip: {
         trigger: 'item',
         formatter:  (params)=>{
-          return this.data.biaogeTishi(params.name)
+          return this.data.biaogeTishiZhi(params.name)
         },
         position: this.data.tableTooltipNoShow2
       },

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

@@ -499,8 +499,8 @@ export class echartsComponent implements OnInit {
     this.threeExample.setOption(option);
     this.threeExample.getZr().on('click', (params) => {
         const pointInPixel= [params.offsetX, params.offsetY];
-      if (this.twoExample.containPixel('grid',pointInPixel)) {
+      if (this.threeExample.containPixel('grid',pointInPixel)) {
-        let xIndex=this.twoExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+        let xIndex=this.threeExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
         if(option.xAxis.data[xIndex]=='2019'||option.xAxis.data[xIndex]=='2020'){
           this.router.navigate(['/statisticanalysis/stataPageThereYearComponent'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
         }else{
@@ -601,8 +601,8 @@ export class echartsComponent implements OnInit {
     this.fourExample.setOption(option);
     this.fourExample.getZr().on('click', (params) => {
       const pointInPixel= [params.offsetX, params.offsetY];
-    if (this.twoExample.containPixel('grid',pointInPixel)) {
+    if (this.fourExample.containPixel('grid',pointInPixel)) {
-      let xIndex=this.twoExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+      let xIndex=this.fourExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
       if(option.xAxis.data[xIndex]=='2019'||option.xAxis.data[xIndex]=='2020'){
         this.router.navigate(['/statisticanalysis/stataPageThereYearComponent'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
       }else{
@@ -704,8 +704,8 @@ export class echartsComponent implements OnInit {
     this.fiveExample.setOption(option);
     this.fiveExample.getZr().on('click', (params) => {
       const pointInPixel= [params.offsetX, params.offsetY];
-    if (this.twoExample.containPixel('grid',pointInPixel)) {
+    if (this.fiveExample.containPixel('grid',pointInPixel)) {
-      let xIndex=this.twoExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+      let xIndex=this.fiveExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
       if(option.xAxis.data[xIndex]=='2019'||option.xAxis.data[xIndex]=='2020'){
         this.router.navigate(['/statisticanalysis/stataPageThereYearComponent'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
       }else{
@@ -806,8 +806,8 @@ export class echartsComponent implements OnInit {
     this.sixExample.setOption(option);
     this.sixExample.getZr().on('click', (params) => {
       const pointInPixel= [params.offsetX, params.offsetY];
-    if (this.twoExample.containPixel('grid',pointInPixel)) {
+    if (this.sixExample.containPixel('grid',pointInPixel)) {
-      let xIndex=this.twoExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+      let xIndex=this.sixExample.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
       if(option.xAxis.data[xIndex]=='2019'||option.xAxis.data[xIndex]=='2020'){
         this.router.navigate(['/statisticanalysis/stataPageThereYearComponent'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':option.title.text}});
       }else{