下拉选择vuex传值增加一个kpiid，柱线图接收时根据不同的kpiid来执行

@@ -202,6 +202,12 @@ export default {
                 name:'使用量',
                 data:seriesUsageValueData
               })
+            }else{
+              series.push({
+                type:'bar',
+                name:'',
+                data:seriesUsageValueData
+              })
             }
 
             if(seriesCapacityData.length>0){
@@ -210,6 +216,12 @@ export default {
                 name:'容量',
                 data:seriesCapacityData
               })
+            }else{
+              series.push({
+                type:'line',
+                name:'',
+                data:seriesCapacityData
+              })
             }
             if(seriesUsageRateData.length>0){
               series.push({
@@ -217,6 +229,12 @@ export default {
                 name:'使用率',
                 data:seriesUsageRateData
               })
+            }else{
+              series.push({
+                type:'line',
+                name:'',
+                data:seriesUsageRateData
+              })
             }
 
           }else{

@@ -46,6 +46,14 @@ export const monitorCustomBarLineChart = {
         placeholder: '',
         value: false,
       },
+      {
+        type: 'el-input-text',
+        label: '下拉列表联动kpi',
+        name: 'vuexFlagKpiId',
+        required: false,
+        placeholder: '',
+        value: '',
+      },
       [
         {
           name: '折线设置',

@@ -27,6 +27,14 @@ export const monitorSelectOption = {
         value: '请选择',
       },
       {
+        type: 'el-input-text',
+        label: '全部的值',
+        name: 'allValue',
+        required: false,
+        placeholder: '',
+        value: 'disk-all',
+      },
+      {
         type: 'el-switch',
         label: '是否可清空',
         name: 'clearable',

@@ -194,10 +194,14 @@ export default {
           if(this.optionsData.dataType=="dynamicData"){
             //改变参下拉列表，重新加载动态数据--待测
             let flag='';
-            if(val){
-              flag=val.join(",");
+            let kpiId='';
+            if(val && val.length>0){
+              kpiId=val[0];
+              flag=val[1].join(",");
+            }
+            if(this.optionsSetup.vuexFlagKpiId==kpiId){
+              this.optionsData.dynamicData.contextData.flag=flag;
             }
-            this.optionsData.dynamicData.contextData.flag=flag;
           }
         }
 

@@ -139,7 +139,7 @@ export default {
     //选项是否加全部
     pushAll(){
       if(this.optionsSetUp.isAll){
-        this.selectOption.unshift({label:'全部',value:null})
+        this.selectOption.unshift({label:'全部',value:this.optionsSetUp.allValue})
       }
     },
     //select的change事件
@@ -148,7 +148,14 @@ export default {
       if(!this.optionsSetUp.multiple){
         data.push(val);
       }
-      this.$store.commit('SELECT_VAL_ARR', data);
+      let kpiId='';
+      if(this.optionsData.dynamicData && this.optionsData.dynamicData.contextData.kpiId){
+        kpiId=this.optionsData.dynamicData.contextData.kpiId
+      }
+      let param=[
+        kpiId,data
+      ]
+      this.$store.commit('SELECT_VAL_ARR', param);
 
     },
     handlerData() {

@@ -190,7 +190,6 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        console.log("&&&&",res)
         if(res && res.length>0){
           if(res[0].code==0){
             this.systemData=res[0].data;