Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts

@@ -134,13 +134,13 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
       //提示框
       tooltip: {
         trigger: 'axis',
-        formatter:  (params)=>{
+        /* formatter:  (params)=>{
           if(params[0].seriesName == "year"){
             return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name)
           }else{
             return this.serviceData.tableTooltip(this.serviceData.tableDataZhi,params[0].name)
           }
-        },
+        }, */
         position:this.serviceData.tableTooltipNoShow2
       },
       // x轴

src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts

@@ -340,13 +340,13 @@ export class AddUnitTwoTimeComponent implements OnInit {
         //提示框
         tooltip: {
           trigger: 'axis',
-          formatter:  (params)=>{
+          /* formatter:  (params)=>{
             if(params[0].seriesName == "year"){
               return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name)
             }else{
               return this.serviceData.tableTooltip(this.serviceData.tableDataZhi,params[0].name)
             }
-          },
+          }, */
           position: this.serviceData.tableTooltipNoShow2
         },
         // x轴