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

柱线图悬浮提示不添加title



See merge request !68

@@ -191,21 +191,29 @@ export default {
               seriesUsageValueData.push(item.usageValue)
 
             })
-            series.push({
-              type:'bar',
-              name:'使用量',
-              data:seriesUsageValueData
-            })
-            series.push({
-              type:'line',
-              name:'容量',
-              data:seriesCapacityData
-            })
-            series.push({
-              type:'line',
-              name:'使用率',
-              data:seriesUsageRateData
-            })
+            if(seriesUsageValueData.length>0){
+              series.push({
+                type:'bar',
+                name:'使用量',
+                data:seriesUsageValueData
+              })
+            }
+
+            if(seriesCapacityData.length>0){
+              series.push({
+                type:'line',
+                name:'容量',
+                data:seriesCapacityData
+              })
+            }
+            if(seriesUsageRateData.length>0){
+              series.push({
+                type:'line',
+                name:'使用率',
+                data:seriesUsageRateData
+              })
+            }
+
           }else{
             xAxisList=[]
             series =  [{

@@ -20,7 +20,7 @@
                 <el-tooltip v-model="visible" :manual="true" placement="right-start">
                   <template #content>
                     <div class="basic-tbody-all basic-border-nowrap" :style="wrapStyle">
-                        <el-row class="basic-item" v-if="item.isDisplay=='1' && (titleName?index>=0:index>0)" v-for="(item,index) in informationDataAll" :key="index">
+                        <el-row class="basic-item" v-if="(item.isDisplay=='1' || !item.isDisplay) && (titleName?index>=0:index>0)" v-for="(item,index) in informationDataAll" :key="index">
                         <el-col :style="[lineHeightStyle]"  v-if="(titleName?index>=0:index>0)" class="basic-border basic-item-title basic-flex" :span="10">
                           {{ item.name }}
                         </el-col>
@@ -29,7 +29,7 @@
                       </el-row>
                     </div>
                   </template>
-                  <i class="el-icon-info"@mouseenter="visible = true"/>
+                  <i  class="el-icon-info"@mouseenter="informationDataAll.length>2?visible = true:visible = false"/>
                 </el-tooltip>
                 <el-tooltip
                   class="box-item"
@@ -43,7 +43,7 @@
             </el-row>
           </div>
         <div class="basic-tbody basic-border-wrap" :style="wrapStyle">
-          <el-row class="basic-item" :style="itemStyle" v-if="item.isDisplay=='1' && (titleName?index>=0:index>0)" v-for="(item,index) in informationData" :key="index">
+          <el-row class="basic-item" :style="itemStyle" v-if="(item.isDisplay=='1' || !item.isDisplay) && (titleName?index>=0:index>0)" v-for="(item,index) in informationData" :key="index">
             <!--          <el-col :style="headStyle"  v-if="attrKey.attrKeyVal.indexOf(item.nameCode)>0 && index>0" class="basic-border basic-item-title basic-flex backColor" :span="10">-->
             <el-col :style="[headStyle,borderStlye,lineHeightStyle]"  v-if="(titleName?index>=0:index>0)" class="basic-border basic-item-title basic-flex backColor" :span="10">
               {{ item.name }}

@@ -393,7 +393,8 @@ export default {
           fontSize: optionsSetup.tipFontSize
         },
         formatter:function (param) {
-          let kpiName=optionsSetup.titleText;
+          // let kpiName=optionsSetup.titleText;
+          let kpiName='';
           // 鼠标悬浮线上提示
           // 顶部提示
           let tips = '<table>';

@@ -413,7 +413,8 @@ export default {
           name: 'L',
           type: 'line',
           data: data.map(function (item) {
-            return item.l + base;
+            // return item.l + base;
+            return item.l ;
           }),
           lineStyle: {
             opacity: 0
@@ -437,7 +438,8 @@ export default {
         {
           type: 'line',
           data: data.map(function (item) {
-            return item.value + base;
+            // return item.value + base;
+            return item.value ;
           }),
           itemStyle: {
             color: arrColor[0]
@@ -459,11 +461,18 @@ export default {
       }
       let toolTip=this.options.tooltip;
       toolTip.formatter=function (params) {
+        console.log("*****",params)
           return (
             params[2].name +
-            '<br />' +
-            ((params[2].value - base) * 100).toFixed(1) +
-            '%'
+            '<br /><div style="text-align: left;">' +
+            '<div>预测最大值：'+(Number(params[1].value)+Number(params[0].value)) +'%</div>' +
+            // '<br />' +
+            // ((params[2].value - base) * 100).toFixed(1) +
+            '<div>实际值：'+params[2].value +'%</div>' +
+            // '<br />' +
+            '<div>预测最小值：'+params[0].value +'%</div></div>'
+
+
           );
         }
 

@@ -211,6 +211,10 @@ export default {
             flagStr=flagArr.join(',')
           }
           this.$store.commit('CHANGE_PROGRESS',flagStr)
+        }else {
+          let name='';
+          this.progressData=[{name:name,rate:0}];
+
         }
       });
     },