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

拓扑图标更改



See merge request !91

@@ -184,6 +184,7 @@ export default {
             let seriesCapacityData=[];//容量
             let seriesCapacityData=[];//容量
             let seriesUsageRateData=[];//使用率
             let seriesUsageRateData=[];//使用率
             let seriesUsageValueData=[];//使用量
             let seriesUsageValueData=[];//使用量
+            let seriesGrowthData=[];//增长量
             dataData.map(item=>{
             dataData.map(item=>{
               xAxisList.push(item.periodVal);
               xAxisList.push(item.periodVal);
               if(item.capacityValue || item.capacityValue==0){
               if(item.capacityValue || item.capacityValue==0){
@@ -195,6 +196,10 @@ export default {
               if(item.usageValue || item.usageValue==0){
               if(item.usageValue || item.usageValue==0){
                 seriesUsageValueData.push(item.usageValue)
                 seriesUsageValueData.push(item.usageValue)
               }
               }
+              //增长量
+              if(item.growth || item.growth==0){
+                seriesGrowthData.push(item.growth);
+              }
             })
             })
             if(seriesUsageValueData.length>0){
             if(seriesUsageValueData.length>0){
               series.push({
               series.push({
@@ -209,7 +214,6 @@ export default {
                 data:seriesUsageValueData
                 data:seriesUsageValueData
               })
               })
             }
             }
-
             if(seriesCapacityData.length>0){
             if(seriesCapacityData.length>0){
               series.push({
               series.push({
                 type:'bar',
                 type:'bar',
@@ -218,11 +222,24 @@ export default {
               })
               })
             }else{
             }else{
               series.push({
               series.push({
-                type:'line',
+                type:'bar',
                 name:'',
                 name:'',
                 data:seriesCapacityData
                 data:seriesCapacityData
               })
               })
             }
             }
+            if(seriesGrowthData.length>0){
+              series.push({
+                type:'bar',
+                name:'增长量',
+                data:seriesGrowthData
+              })
+            }else{
+              series.push({
+                type:'bar',
+                name:'',
+                data:seriesGrowthData
+              })
+            }
             if(seriesUsageRateData.length>0){
             if(seriesUsageRateData.length>0){
               series.push({
               series.push({
                 type:'line',
                 type:'line',

@@ -135,6 +135,19 @@ export const monitorCustomBarLineChart = {
               placeholder: '',
               placeholder: '',
               value: 0,
               value: 0,
             },
             },
+            {
+              type: 'el-select',
+              label: '叠加类型',
+              name: 'stackStype',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'total', name: '堆叠'},
+                {code: 'barGap', name: '叠加'},
+                {code: 'noStack', name: '不堆叠'},
+              ],
+              value: 'total'
+            },
           ],
           ],
         },
         },
         {
         {

@@ -42,6 +42,14 @@ export const monitorCustomLiquidFillChart = {
         ],
         ],
         value: 'column'
         value: 'column'
       },
       },
+      {
+        type: 'el-input-text',
+        label: '提示信息',
+        name: 'formula',
+        required: false,
+        placeholder: '',
+        value: '增长率=(本次值-上次值)/上次值;平均增长率 = 总增长率/总增长次数',
+      },
       [
       [
         {
         {
           name: '水球设置',
           name: '水球设置',

@@ -550,6 +550,7 @@
     color: #0d82e9;
     color: #0d82e9;
     cursor: pointer;
     cursor: pointer;
     margin-right:5px;
     margin-right:5px;
+    text-decoration: underline;
   }
   }
   .box-item{
   .box-item{
     margin-left:5px;
     margin-left:5px;

@@ -200,6 +200,7 @@ export default {
               flag=val[1].join(",");
               flag=val[1].join(",");
             }
             }
             if(this.optionsSetup.vuexFlagKpiId==kpiId){
             if(this.optionsSetup.vuexFlagKpiId==kpiId){
+              this.hackReset=false;
               this.optionsData.dynamicData.contextData.flag=flag;
               this.optionsData.dynamicData.contextData.flag=flag;
             }
             }
           }
           }
@@ -621,7 +622,16 @@ export default {
               barBorderRadius: null
               barBorderRadius: null
             }
             }
             item.barMinHeight=2;
             item.barMinHeight=2;
-            item.stack='total';
+            if(this.optionsSetup.stackStype=='total'){
+              item.stack=this.optionsSetup.stackStype
+            }else if(this.optionsSetup.stackStype=='barGap'){
+              item.stack=false;
+              item.barGap='-100%';
+            }else if(this.optionsSetup.stackStype=='noStack'){
+              item.stack=false;
+            }else{
+              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'){

@@ -15,7 +15,15 @@
           </div>
           </div>
         </div>
         </div>
         <div class="wave-title" :style="subTitleStyle" v-if="index==0">当前使用率</div>
         <div class="wave-title" :style="subTitleStyle" v-if="index==0">当前使用率</div>
-        <div class="wave-title" :style="subTitleStyle" v-if="index==1">{{getIndex2Name()}}</div>
+        <div class="wave-title" :style="subTitleStyle" v-if="index==1">
+          <span>{{getIndex2Name()}}</span>
+          <el-tooltip v-model="visible"  placement="right-start">
+            <template #content>
+              <div v-for="(item,index) in formula" :key="index" style="padding:5px;">{{item}}</div>
+            </template>
+            <i  class="el-icon-info" v-if="optionsSetup.formula" style="color:rgb(13, 130, 233);" @mouseenter="optionsSetup.formula?visible = true:visible = false"/>
+            </el-tooltip>
+        </div>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -36,6 +44,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      visible:false,
       // topStyle:'',//水波纹的大小
       // topStyle:'',//水波纹的大小
       fillData:[],//数据
       fillData:[],//数据
       // topNum:0,//水波纹的大小
       // topNum:0,//水波纹的大小
@@ -127,6 +136,14 @@ export default {
     buttonVal(){
     buttonVal(){
       return this.buttonVals;
       return this.buttonVals;
     },
     },
+    //公式分行
+    formula(){
+      let arr=[];
+      if(this.optionsSetup.formula){
+        arr=this.optionsSetup.formula.split(";")
+      }
+      return arr;
+    },
     styleObj() {
     styleObj() {
       return {
       return {
         position: this.ispreview ? "absolute" : "static",
         position: this.ispreview ? "absolute" : "static",