Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue

@@ -372,14 +372,11 @@ export default {
     },
     // 触发人数
     getBrokenEcharts1() {
-      let dataX = this.resX;
-      let dataY1 = this.resY;
       this.brokenEcharts1 = echarts.init(
         document.getElementById("brokenEcharts1")
       );
       this.brokenEcharts1.setOption({
         tooltip: {
-          show: this.filterShow == true? false: true ,
           trigger: "axis",
         },
         grid: {
@@ -418,7 +415,7 @@ export default {
         series: [
           {
             type: "line",
-            data: dataY1,
+            data: this.resY,
             lineStyle: {
               color: "#4B87FE",
             },
@@ -436,7 +433,6 @@ export default {
       );
       this.brokenEcharts2.setOption({
         tooltip: {
-          show: this.filterShow == true? false: true,
           trigger: "axis",
         },
         grid: {
@@ -494,7 +490,6 @@ export default {
       );
       this.brokenEcharts3.setOption({
         tooltip: {
-          show: this.filterShow == true? false: true ,
           trigger: "axis",
         },
         grid: {
@@ -572,7 +567,6 @@ export default {
                   this.getColumnarEcharts(xData, yData)
                 })
               },600)
-              
             }
           }
         });
@@ -611,18 +605,18 @@ export default {
         },
         series: [
           { 
-            label: {
-              show: true,
-              position: top,
-              textStyle: {
-                fontSize: 13,
-                color: '#666'
-              }
-            },
             data: yData,
             itemStyle: {
               normal: {
                 color: "#5087ec",
+                label: {
+                  show: true,  //开启显示
+                  position: 'top',    //在上方显示
+                  textStyle: {
+                    fontSize: 13,
+                    color: '#666'
+                  }
+                },
               },
             },
             type: "bar",