Merge remote-tracking branch 'origin/visu_firecontrol_01_siping_2.5d' into visu_firecontrol_01_siping_2.5d

src/views/bigdata/chart-foamLiquid.vue

@@ -39,7 +39,7 @@
         let that = this
         var chartDom = document.getElementById('foam');
         var myChart = echarts.init(chartDom);
-        var zdslColorList = ['#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF'];
+        var zdslColorList = ['#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF','#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF','#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF','#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF','#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF','#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF'];
         var option;
         option = {
           grid: {
@@ -54,7 +54,7 @@
             show: false,
             type: 'value'
           },
-          yAxis: [{
+          yAxis: {
             type: 'category',
             inverse: true,
             data: that.data_pmy_name,
@@ -75,47 +75,9 @@
               show: false
             },
           },
-            {
-              splitLine: {
-                show: false
-              },
-              axisTick: {
-                show: false
-              },
-              axisLine: {
-                show: false
-              },
-              axisLabel: {
-                show: true,
-                textStyle: {
-                  color: '#ADD6FF',
-                  fontSize: '12'
-                }
-              },
-              data:that.data_pmy_value
-            }
-          ],
-
-          series: [{
-            type: "bar",
-            barWidth: "20%",
-            yAxisIndex: 0,
-            data: that.data_pmy_value.map((item, i) => {
-              return {
-                value: item,
-                itemStyle: {
-                  color: "rgba(0,0,0,0)",
-                  barBorderColor: zdslColorList[i],
-                  borderWidth: 1,
-                  shadowColor: "#33CCFF",
-                  shadowBlur: 4
-                }
-              }
-            }),
-          },
+          series: [
             {
               type: 'bar',
-              yAxisIndex: 1,
               barWidth: "10%",
               data: that.data_pmy_value
             }

src/views/bigdata/chart-fullTimeStation.vue

@@ -80,7 +80,18 @@
         var option = {
           backgroundColor: '#222',
           tooltip: {
-            trigger: 'item',
+            trigger: 'axis',
+            formatter: function(params) {
+              var result = params[0].name + "<br>";
+              params.forEach(function(item) {
+                if (item.value) {
+                  result += item.marker + " " + item.value + "%</br>";
+                } else {
+                  result += item.marker + " </br>";
+                }
+              });
+              return result;
+            },
             textStyle: {
               fontSize: 16,
               color: '#fff',