|
|
|
|
@ -36,15 +36,12 @@
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
<script>
|
|
|
|
|
import Chart from "@/components/Charts/Chart.vue";
|
|
|
|
|
import * as echarts from 'echarts'
|
|
|
|
|
import {realTimeData} from "@/api/board";
|
|
|
|
|
import ListItem from "./components/listItem.vue";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: 'Board1',
|
|
|
|
|
components: {
|
|
|
|
|
Chart,
|
|
|
|
|
ListItem
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
@ -54,138 +51,9 @@ export default {
|
|
|
|
|
fieldUnits: {
|
|
|
|
|
vA: 'V', vB: 'V', vC: 'V',
|
|
|
|
|
iA: 'A', iB: 'A', iC: 'A',
|
|
|
|
|
zxyg: '', fxyg: '',
|
|
|
|
|
zxyg: 'kwh', fxyg: 'kwh',
|
|
|
|
|
},
|
|
|
|
|
fieldFilter: ['vA', 'vB', 'vC', 'iA', 'iB', 'iC', 'zxyg', 'fxyg'],
|
|
|
|
|
list1: [
|
|
|
|
|
{
|
|
|
|
|
"name": "root",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-1",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-1-1",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-1-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-1-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-1-2",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-1-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-1-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-2",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-2-1",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-2-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-2-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-1-2-2",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-2-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-2-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-1",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-1-1",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-1-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-1-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-1-2",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-1-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-1-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-2",
|
|
|
|
|
"children": [
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-2-1",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-2-1-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-2-1-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "child-2-2-2",
|
|
|
|
|
"children": [],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-2-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-2-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-2-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-2-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"device": [
|
|
|
|
|
{"name": "device-root-a", "children": [], "device": []},
|
|
|
|
|
{"name": "device-root-b", "children": [], "device": []}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
list: [],
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@ -197,12 +65,9 @@ export default {
|
|
|
|
|
const map = {};
|
|
|
|
|
const tree = [];
|
|
|
|
|
|
|
|
|
|
// 先创建map，key为objId
|
|
|
|
|
data.forEach(item => {
|
|
|
|
|
// 深拷贝，防止修改原数组
|
|
|
|
|
map[item.objId] = {...item, children: [], device: []};
|
|
|
|
|
|
|
|
|
|
// 如果isAmmeter为1，生成deviceData
|
|
|
|
|
if (item.isAmmeter === "1") {
|
|
|
|
|
map[item.objId].deviceData = fieldFilter
|
|
|
|
|
.filter(f => f in item)
|
|
|
|
|
@ -214,15 +79,10 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// 构建树
|
|
|
|
|
data.forEach(item => {
|
|
|
|
|
const node = map[item.objId];
|
|
|
|
|
if (item.parentId && map[item.parentId]) {
|
|
|
|
|
map[item.parentId].children.push(node);
|
|
|
|
|
// 如果需要，把isAmmeter为1的节点也放到device数组里
|
|
|
|
|
// if (item.isAmmeter === "1") {
|
|
|
|
|
// map[item.parentId].device.push(node);
|
|
|
|
|
// }
|
|
|
|
|
} else {
|
|
|
|
|
tree.push(node);
|
|
|
|
|
}
|
|
|
|
|
|
夜笙歌
3 months ago