Skip to content

Commit 2378c98

Browse files
committed
sonme bug
1 parent 5be7892 commit 2378c98

File tree

2 files changed

+334
-318
lines changed

2 files changed

+334
-318
lines changed

src/views/tb/telemetry/index.vue

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@
4545
v-if="showChartView"
4646
:loading="loading"
4747
:dataSource="dataSource"
48-
:grid="{ gutter: 5, xs: 1, sm: 1, md: 2, lg: 2, xl: 3, xxl: 3 }"
48+
:grid="{ gutter: 5, xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 2 }"
4949
>
5050
<template #renderItem="{ item }">
51-
{{ item }}
5251
<List.Item v-bind:style="{ padding: '6px' }">
5352
<TimeseriesChart
54-
:keyStr="item.key"
5553
:entityType="props.entityType"
5654
:entityId="props.entityId"
5755
:kvEntity="item"
@@ -88,6 +86,7 @@
8886
import AttributeModal from './attributeFrom.vue';
8987
import DeleteModal from './delete.vue';
9088
import { DataType } from '/@/enums/thingsModelEnum';
89+
import { isNull } from '/@/utils/is';
9190
const LATEST_TELEMETRY = 'LATEST_TELEMETRY';
9291
9392
const props = defineProps({
@@ -327,12 +326,17 @@
327326
}
328327
329328
function onWebsocketMessage(data: any) {
330-
dataSource.value = Object.keys(data.data).map((key) => ({
331-
key: key,
332-
value: data.data[key][0][1],
333-
lastUpdateTs: data.data[key][0][0],
334-
property: data.properties[key],
335-
}));
329+
dataSource.value = Object.keys(data.data).map((key) =>
330+
{
331+
console.log(data )
332+
console.log(data.properties);
333+
return {
334+
key: key,
335+
value: data.data[key][0][1],
336+
lastUpdateTs: data.data[key][0][0],
337+
property: isNull(data.properties)? null: data.properties[key]
338+
}
339+
});
336340
}
337341
338342
function handleDelete(data: any) {

0 commit comments

Comments
 (0)