基本信息二功能优化，添加表头动态设置

@@ -188,7 +188,7 @@ export default {
           value:'textToBg'
           value:'textToBg'
         }
         }
       ],//关联组件
       ],//关联组件
-      formDataNew:this.formData,//表头数据
+      formDataNew:'',//表头数据
     };
     };
   },
   },
   computed:{
   computed:{

@@ -15,7 +15,8 @@
           <div @mouseenter="mouseFun" @mouseleave="leaveFun" v-if="informationData[0].isDisplay=='1'">
           <div @mouseenter="mouseFun" @mouseleave="leaveFun" v-if="informationData[0].isDisplay=='1'">
           <el-row class="backColor">
           <el-row class="backColor">
             <el-col class="padding-10" :style="[borderStlye,tableTitleStyle]" aria-colspan="2">
             <el-col class="padding-10" :style="[borderStlye,tableTitleStyle]" aria-colspan="2">
-              <a class="link-type" :style="tableTitleStyle" :href="jkAddress.jkUrl" target="_blank">{{informationData[0].name}}</a>
+              <span class="link-type" :style="tableTitleStyle" @click="goTrend(informationData[0])">{{informationData[0].name}}</span>
+<!--              <a class="link-type" :style="tableTitleStyle" :href="jkAddress.jkUrl" target="_blank"></a>-->
               <i class="el-icon-info" v-if="visible" @click="resTopo"/>
               <i class="el-icon-info" v-if="visible" @click="resTopo"/>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -59,6 +60,7 @@
 <script>
 <script>
     // import customMenuBox from "../../designerComponents/customMenuBox";//下探组件
     // import customMenuBox from "../../designerComponents/customMenuBox";//下探组件
     import customDialog from "../../designerComponents/customDialog";
     import customDialog from "../../designerComponents/customDialog";
+    import {mapGetters} from "_vuex@3.0.1@vuex";
     // import dynamicTableComponents from "../../designerComponents/dynamicTableComponents";
     // import dynamicTableComponents from "../../designerComponents/dynamicTableComponents";
 
 
     export default {
     export default {
@@ -86,7 +88,8 @@
                 topoSrc: '',
                 topoSrc: '',
                 resUrl: 'http://www.baidu.com', //跳转详情页面
                 resUrl: 'http://www.baidu.com', //跳转详情页面
                 topoVisible: false,  //资源topo弹框
                 topoVisible: false,  //资源topo弹框
-                dialogName: "" //弹框标题
+                dialogName: "" ,//弹框标题
+              addTableData:[],//传递的表头设置的内容
             }
             }
         },
         },
         components: {customDialog},//customMenuBox
         components: {customDialog},//customMenuBox
@@ -95,7 +98,8 @@
             ispreview: Boolean,
             ispreview: Boolean,
         },
         },
         computed: {
         computed: {
-            transStyle() {
+          ...mapGetters(['tableHeadInfos']),
+          transStyle() {
                 return this.objToOne(this.options);
                 return this.objToOne(this.options);
             },
             },
             styleObj() {
             styleObj() {
@@ -287,30 +291,33 @@
                     : this.handlerDynamicData(resData.dynamicData, resData.refreshTime);
                     : this.handlerDynamicData(resData.dynamicData, resData.refreshTime);
             },
             },
             handlerStaticData(data) {
             handlerStaticData(data) {
+
                 this.informationDataAll = data;
                 this.informationDataAll = data;
                 if (this.informationDataAll && this.informationDataAll.length > 0) {
                 if (this.informationDataAll && this.informationDataAll.length > 0) {
                   this.informationDataAll.map(item => {
                   this.informationDataAll.map(item => {
                     if (typeof (item.value) != 'string') {
                     if (typeof (item.value) != 'string') {
                       item.value = item.value[0].state;
                       item.value = item.value[0].state;
                     }
                     }
-                    item.isDisplay='1';
+                    if(this.tableHeadInfos.length==0) {
+                      item.isDisplay = '1';
+                    }
 
 
                   })
                   })
                 }
                 }
-                let addTableData=[];
+                this.addTableData=[];
                 this.informationDataAll.map((item,index)=>{
                 this.informationDataAll.map((item,index)=>{
-                  addTableData.push({
+                  this.addTableData.push({
                     key:item.code,
                     key:item.code,
                     name:item.name,
                     name:item.name,
                     width:"50%",
                     width:"50%",
-                    // isDisplay:item.isDisplay,
+                    isDisplay:item.isDisplay,
                     state:item.state,
                     state:item.state,
                     value:item.value
                     value:item.value
                   })
                   })
                 })
                 })
-              this.setDisplay();
+                this.$store.commit('CHANGW_HEAD_INFO', this.addTableData);
+                this.setDisplay();
 
 
-              this.$store.commit('CHANGW_HEAD_INFO', addTableData);
             },
             },
             handlerDynamicData(data, refreshTime) {
             handlerDynamicData(data, refreshTime) {
                 if (!data) return;
                 if (!data) return;
@@ -333,7 +340,9 @@
                             if (typeof (item.value) != 'string') {
                             if (typeof (item.value) != 'string') {
                                 item.value = item.value[0].state;
                                 item.value = item.value[0].state;
                             }
                             }
-                          item.isDisplay='1';
+                          if(this.tableHeadInfos.length==0) {
+                            item.isDisplay = '1';
+                          }
 
 
                         })
                         })
                     }
                     }
@@ -347,11 +356,12 @@
                         key:item.code,
                         key:item.code,
                         name:item.name,
                         name:item.name,
                         width:"50%",
                         width:"50%",
-                        isDisplay:item.isDisplay
+                        isDisplay:item.isDisplay,
+                        state:item.state,
+                        value:item.value
                       })
                       })
                     })
                     })
                     this.$store.commit('CHANGW_HEAD_INFO', addTableData);
                     this.$store.commit('CHANGW_HEAD_INFO', addTableData);
-
                     this.hackResetFun();
                     this.hackResetFun();
                 });
                 });
             },
             },
@@ -365,35 +375,15 @@
             //设置信息列表数据每一行是否显示
             //设置信息列表数据每一行是否显示
             setDisplay() {
             setDisplay() {
               let head=this.optionsSetUp.dynamicAddTable;
               let head=this.optionsSetUp.dynamicAddTable;
-              let arr=[];
-              head.map(hv=>{
-                arr.push({
-                  code:hv.key,
-                  name:hv.name,
-                  isDisplay:hv.isDisplay,
-                  state:hv.state,
-                  value:hv.value
-                })
-              })
-              /*this.informationDataAll.map(item=>{
-                console.log("&&&&&&",item)
-                arr.map(hv=>{
-                  if(item.code==hv.code){
-                    console.log("***")
-                      item.isDisplay=hv.isDisplay;
-                  }
-                })
-              })*/
-              this.informationDataAll=arr;
-             /* for(let i=0;i<arr.length;i++){
-                if(arr[i].code==this.informationDataAll[i].code){
-                  this.informationDataAll[i].isDisplay=arr[i].isDisplay;
+
+              for(let i=0;i<head.length;i++){
+                if(head[i].key==this.informationDataAll[i].code){
+                  this.informationDataAll[i].isDisplay=head[i].isDisplay;
                 }
                 }
-              }*/
+              }
               if (this.imgStyle.dataNum) {
               if (this.imgStyle.dataNum) {
                 this.informationData = this.informationDataAll.slice(0, this.imgStyle.dataNum);
                 this.informationData = this.informationDataAll.slice(0, this.imgStyle.dataNum);
               }
               }
-              console.log(" this.informationData",head,arr,this.informationDataAll, this.informationData)
             },
             },
             pressingTimes() {
             pressingTimes() {
                 this.pressingVisible = true;
                 this.pressingVisible = true;
@@ -425,7 +415,19 @@
             },
             },
             okFunc() {
             okFunc() {
                 this.topoVisible = false;
                 this.topoVisible = false;
-            }
+            },
+            //打开详情页
+            goTrend(item) {
+                let param = {
+                  type:'detail',
+                  data:{
+                    resId: item.resId,
+                    resType: item.resType
+                  }
+
+                }
+                window.parent.postMessage(param, '*')
+            },
 
 
         },
         },
     }
     }
@@ -478,6 +480,7 @@
   .link-type {
   .link-type {
     white-space: nowrap;
     white-space: nowrap;
     color: #0d82e9;
     color: #0d82e9;
+    cursor: pointer;
   }
   }
 
 
   .title-name {
   .title-name {

@@ -427,7 +427,7 @@ export default {
           this.selectNum = 1;
           this.selectNum = 1;
 
 
         }
         }
-        let scrollHeight=e.target.documentElement.scrollTop;
+        let scrollHeight=e.target.documentElement?e.target.documentElement.scrollTop:0;
 
 
         if (self != top) {
         if (self != top) {
           //嵌入到监控系统iframe中弹框位置样式
           //嵌入到监控系统iframe中弹框位置样式