添加数据单位

master
夜笙歌 3 months ago
parent 2556df6294
commit c0c3e453cf

@ -36,15 +36,12 @@
</div> </div>
</template> </template>
<script> <script>
import Chart from "@/components/Charts/Chart.vue";
import * as echarts from 'echarts'
import {realTimeData} from "@/api/board"; import {realTimeData} from "@/api/board";
import ListItem from "./components/listItem.vue"; import ListItem from "./components/listItem.vue";
export default { export default {
name: 'Board1', name: 'Board1',
components: { components: {
Chart,
ListItem ListItem
}, },
data() { data() {
@ -54,138 +51,9 @@ export default {
fieldUnits: { fieldUnits: {
vA: 'V', vB: 'V', vC: 'V', vA: 'V', vB: 'V', vC: 'V',
iA: 'A', iB: 'A', iC: 'A', iA: 'A', iB: 'A', iC: 'A',
zxyg: '', fxyg: '', zxyg: 'kwh', fxyg: 'kwh',
}, },
fieldFilter: ['vA', 'vB', 'vC', 'iA', 'iB', 'iC', 'zxyg', 'fxyg'], 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: [], list: [],
} }
}, },
@ -197,12 +65,9 @@ export default {
const map = {}; const map = {};
const tree = []; const tree = [];
// mapkeyobjId
data.forEach(item => { data.forEach(item => {
//
map[item.objId] = {...item, children: [], device: []}; map[item.objId] = {...item, children: [], device: []};
// isAmmeter1deviceData
if (item.isAmmeter === "1") { if (item.isAmmeter === "1") {
map[item.objId].deviceData = fieldFilter map[item.objId].deviceData = fieldFilter
.filter(f => f in item) .filter(f => f in item)
@ -214,15 +79,10 @@ export default {
} }
}); });
//
data.forEach(item => { data.forEach(item => {
const node = map[item.objId]; const node = map[item.objId];
if (item.parentId && map[item.parentId]) { if (item.parentId && map[item.parentId]) {
map[item.parentId].children.push(node); map[item.parentId].children.push(node);
// isAmmeter1device
// if (item.isAmmeter === "1") {
// map[item.parentId].device.push(node);
// }
} else { } else {
tree.push(node); tree.push(node);
} }

Loading…
Cancel
Save