|
@@ -1,28 +1,5 @@
|
|
|
<template>
|
|
|
<div class="tableDisplay">
|
|
|
- <!-- <el-row :gutter="24">
|
|
|
- <el-col :span="18">
|
|
|
- 设备信息点
|
|
|
- <div class="grid-content bgc-white">
|
|
|
- <selectRadio :selectRadio="selectRadio"/>
|
|
|
- <el-row>
|
|
|
- :span的值可以根据条件改变 是一个24 or 两个 16:8
|
|
|
- <el-col :span="16">
|
|
|
- <exhibitionBaseInformation/>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- 能耗信息点
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
-
|
|
|
- </div>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <div class="grid-content bgc-white">
|
|
|
- <exhibitionImage :exhibitionImage="exhibitionImage"/>
|
|
|
- </div>
|
|
|
- </el-col>
|
|
|
- </el-row> -->
|
|
|
<div class="header">
|
|
|
<el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
|
|
|
<span class="details-title"><b>{{name}} - {{code}}</b></span>
|
|
@@ -39,7 +16,11 @@
|
|
|
<div class="content-point-left">
|
|
|
<el-scrollbar style="height:100%;">
|
|
|
<div style="height:1000px">
|
|
|
- <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
|
|
|
+ <exhibitionBaseInformation
|
|
|
+ :exhibitionBaseInformation="exhibitionBaseInformation"
|
|
|
+ :information="information"
|
|
|
+ :exampleData="exampleData"
|
|
|
+ />
|
|
|
</div>
|
|
|
</el-scrollbar>
|
|
|
</div>
|
|
@@ -110,6 +91,7 @@
|
|
|
list: [], //设备列表
|
|
|
pointData: [], //信息点数据
|
|
|
exampleData: {}, //实例数据
|
|
|
+ information:{},//传给组件
|
|
|
selectRadio: {
|
|
|
information: '设备信息点',
|
|
|
radioList: [
|
|
@@ -187,6 +169,34 @@
|
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
|
this.pointData = values[0].Content;
|
|
|
this.exampleData = values[1].Content[0];
|
|
|
+ let objectList = {}
|
|
|
+ //
|
|
|
+ const result = {}
|
|
|
+
|
|
|
+ values[0].Content.forEach(i => {
|
|
|
+ if( this.exampleData.hasOwnProperty(i.Path)) {
|
|
|
+ i.value = this.exampleData[i.Path]
|
|
|
+ console.log(i.InfoPointName,i.value,'======')
|
|
|
+ }
|
|
|
+ if (result[`${i.FirstName}${i.SecondName? '/'+i.SecondName:''}`]) {
|
|
|
+ result[`${i.FirstName}${i.SecondName? '/'+i.SecondName:''}`].paths.push({
|
|
|
+ Path:i.Path,
|
|
|
+ InfoPointName: i.InfoPointName,
|
|
|
+ InfoPointCode: i.InfoPointCode,
|
|
|
+ Value:i.value
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ result[`${i.FirstName}${i.SecondName? '/'+i.SecondName:''}`] = {
|
|
|
+ paths: [{
|
|
|
+ Path:i.Path,
|
|
|
+ InfoPointName: i.InfoPointName,
|
|
|
+ InfoPointCode: i.InfoPointCode,
|
|
|
+ Value:i.value
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.information = result
|
|
|
})
|
|
|
},
|
|
|
goBack () {
|