Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/anji-plus-re…

…port into master-500-dev

@@ -212,7 +212,7 @@ export default {
 
 
             if(seriesCapacityData.length>0){
             if(seriesCapacityData.length>0){
               series.push({
               series.push({
-                type:'line',
+                type:'bar',
                 name:'容量',
                 name:'容量',
                 data:seriesCapacityData
                 data:seriesCapacityData
               })
               })

@@ -724,7 +724,7 @@ export const monitorCustomBarLineChart = {
               label: '',
               label: '',
               name: 'customColor',
               name: 'customColor',
               required: false,
               required: false,
-              value: [{color: '#3b91ff'}, {color: '#2c2f90'}, {color: '#ff1111'}],
+              value: [{color: '#FF795D'}, {color: '#24AAFF'}, {color: '#ff1111'}],
             },
             },
           ],
           ],
         },
         },

@@ -89,7 +89,7 @@ export default {
           },
           },
           {
           {
             name: "",
             name: "",
-            type: "line",
+            type: "bar",
             yAxisIndex: 1,
             yAxisIndex: 1,
             data: [],
             data: [],
             itemStyle: {}
             itemStyle: {}
@@ -621,6 +621,7 @@ export default {
               barBorderRadius: null
               barBorderRadius: null
             }
             }
             item.barMinHeight=2;
             item.barMinHeight=2;
+            item.stack='total';
             //切换页面后bar的宽度改变
             //切换页面后bar的宽度改变
             item.barWidth = this.optionsSetup.maxWidth;
             item.barWidth = this.optionsSetup.maxWidth;
           }else if(item.type=='line'){
           }else if(item.type=='line'){