Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

趋势图根据年/季度/月按钮切换注释



See merge request !69

@@ -217,7 +217,7 @@ export default {
           }else{
           }else{
             xAxisList=[]
             xAxisList=[]
             series =  [{
             series =  [{
-              name: "",
+              name: "使用量",
               type:'bar',
               type:'bar',
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
             }];
             }];
@@ -227,7 +227,7 @@ export default {
         // xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
         // xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
         xAxisList=[]
         xAxisList=[]
         series =  [{
         series =  [{
-          name: "",
+          name: "使用量",
           type:'bar',
           type:'bar',
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         }];
         }];

@@ -144,7 +144,6 @@ export default {
     //监听月季度年按钮切换值
     //监听月季度年按钮切换值
     progressData:{
     progressData:{
       handler(val){
       handler(val){
-        console.log("_______",val)
        /* let arr=[];
        /* let arr=[];
         let newArr=[];
         let newArr=[];
         if(val){
         if(val){
@@ -403,15 +402,28 @@ export default {
           } else {
           } else {
             tips += "<tr><td style='text-align:left;'  colspan='4'>" +  kpiName + " " + param[0].name + "</td></tr>";
             tips += "<tr><td style='text-align:left;'  colspan='4'>" +  kpiName + " " + param[0].name + "</td></tr>";
           }
           }
+          let flag='';
+          if(that.optionsData.dynamicData.contextData){
+            flag=that.optionsData.dynamicData.contextData.flag
+          }
+
           // 每一条提示
           // 每一条提示
           $.each(param, function (i, v) {
           $.each(param, function (i, v) {
             let kpiUnit='';
             let kpiUnit='';
             tips += "<tr><td>" + v.marker + "</td>";
             tips += "<tr><td>" + v.marker + "</td>";
             tips += '<td style="text-align: left;">';
             tips += '<td style="text-align: left;">';
             if (v.seriesName.indexOf('率') != -1) {
             if (v.seriesName.indexOf('率') != -1) {
-              kpiUnit='%';
-            }else{
+              kpiUnit=' %';
+            }else if(that.kpiUnit){
               kpiUnit=that.kpiUnit
               kpiUnit=that.kpiUnit
+            }else{
+              if(flag=='cpu'){
+                kpiUnit=' GHz';
+              }else if(flag=='mem'){
+                kpiUnit=' GB';
+              }else if(flag=='storage'){
+                kpiUnit=' TB';
+              }
             }
             }
             tips += (v.seriesName + ' ');
             tips += (v.seriesName + ' ');
 
 

@@ -95,11 +95,11 @@ export default {
       handler(val){
       handler(val){
         if(this.optionsSetup.isVuex){
         if(this.optionsSetup.isVuex){
           let optionsData=this.optionsData;
           let optionsData=this.optionsData;
-          if(this.optionsData.dataType=="dynamicData"){
+         /* if(this.optionsData.dataType=="dynamicData"){
             //改变参数值-月季度年，重新加载动态数据--待测
             //改变参数值-月季度年，重新加载动态数据--待测
             this.optionsData.dynamicData.contextData.dataScope=val;
             this.optionsData.dynamicData.contextData.dataScope=val;
             // this.editorOptions();
             // this.editorOptions();
-          }
+          }*/
         }
         }
 
 
       },
       },
@@ -375,8 +375,10 @@ export default {
         arrColor.push(customColor[i].color);
         arrColor.push(customColor[i].color);
       }
       }
       let xAxisList = [];
       let xAxisList = [];
+      let unit='%';
       if(data && data.length>0){
       if(data && data.length>0){
         xAxisList=data.map(function (item) {
         xAxisList=data.map(function (item) {
+          unit=item.unit?item.unit:'%';
           return item.date;
           return item.date;
         })
         })
       }else {
       }else {
@@ -461,16 +463,15 @@ export default {
       }
       }
       let toolTip=this.options.tooltip;
       let toolTip=this.options.tooltip;
       toolTip.formatter=function (params) {
       toolTip.formatter=function (params) {
-        console.log("*****",params)
           return (
           return (
             params[2].name +
             params[2].name +
             '<br /><div style="text-align: left;">' +
             '<br /><div style="text-align: left;">' +
-            '<div>预测最大值：'+(Number(params[1].value)+Number(params[0].value)) +'%</div>' +
+            '<div>预测最大值：'+(Number(params[1].value)+Number(params[0].value)) +unit+'</div>' +
             // '<br />' +
             // '<br />' +
             // ((params[2].value - base) * 100).toFixed(1) +
             // ((params[2].value - base) * 100).toFixed(1) +
-            '<div>实际值：'+params[2].value +'%</div>' +
+            '<div>实际值：'+params[2].value +unit+'</div>' +
             // '<br />' +
             // '<br />' +
-            '<div>预测最小值：'+params[0].value +'%</div></div>'
+            '<div>预测最小值：'+params[0].value +unit+'</div></div>'
 
 
 
 
           );
           );

@@ -186,7 +186,7 @@ export default {
             }else{
             }else{
               let name='';
               let name='';
               if(this.optionsData.dynamicData.contextData.kpiId=='KPI7054BC34,KPIBDB60856,KPID3EBE40F'){
               if(this.optionsData.dynamicData.contextData.kpiId=='KPI7054BC34,KPIBDB60856,KPID3EBE40F'){
-                name='cpu';
+                name='CPU';
               }else if(this.optionsData.dynamicData.contextData.kpiId=='KPI1584BE1C,KPI31CB8D97'){
               }else if(this.optionsData.dynamicData.contextData.kpiId=='KPI1584BE1C,KPI31CB8D97'){
                 name='内存';
                 name='内存';
               }else if(this.optionsData.dynamicData.contextData.kpiId=='KPI98306224,KPIA91F44E7'){
               }else if(this.optionsData.dynamicData.contextData.kpiId=='KPI98306224,KPIA91F44E7'){