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

背景组件也根据是否有asm数据显示/隐藏



See merge request !98

@@ -26,6 +26,14 @@ export const monitorBgBorder = {
         placeholder: '',
         value:  require("../../../../../../../assets/images/monitor/capacityAnalysis/icon-plat-info.png"),
       },
+      {
+        type: 'el-input-text',
+        label: 'kpiId',
+        name: 'vuexFlagKpiId',
+        required: false,
+        placeholder: '',
+        value: '',
+      },
       [{
         name: '标题设置',
         list: [

 <template>
-  <div class="basicInformation-container" :style="styleObj">
+  <div class="basicInformation-container" :style="styleObj" v-if="display">
     <div class="info-title" :style="titleStyle">
       <img :src="imgStyle.titleIcon" alt="" class="icon-title">
       {{optionsSetUp.titleName}}
@@ -14,6 +14,7 @@ export default {
   data() {
     return {
       options: {},
+      display:true,
       optionsSetUp: {},
       optionsPosition:{},
       optionsData:{},
@@ -33,7 +34,7 @@ export default {
       return {
         position: this.ispreview ? "absolute" : "static",
         width: allStyle.width + "px",
-        height: allStyle.height + "px",
+        height: this.display?allStyle.height + "px":'0',
         left: allStyle.left + "px",
         top: allStyle.top + "px",
         'background':this.transStyle.bgColor,
@@ -72,7 +73,7 @@ export default {
         this.optionsSetUp = val.setup;
         this.optionsPosition = val.position;
         // this.handlerData();
-
+        this.setIsDisplay();
       },
       deep: true
     }
@@ -83,10 +84,27 @@ export default {
     this.optionsSetUp = this.value.setup;
     this.optionsPosition = this.value.position;
     // this.handlerData();
+    this.setIsDisplay();
 
   },
   methods: {
-
+  setIsDisplay(){
+    let propType=this.$route.query.propType;
+    if(propType=='res'){
+      let kpiId='';
+      let kpiIdFla=this.transStyle.vuexFlagKpiId;
+      if(kpiIdFla){
+        kpiId=this.transStyle.vuexFlagKpiId
+      }
+      if(kpiId=='KPI922F8FF7'){
+        this.display=this.$route.query.display=='true'?true:false;
+      }else{
+        this.display=true;
+      }
+    }else{
+      this.display=true;
+    }
+  },
     handlerData() {
       const resData = this.optionsData;
       resData.dataType == "staticData"