|
45 | 45 | v-if="showChartView"
|
46 | 46 | :loading="loading"
|
47 | 47 | :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 }" |
49 | 49 | >
|
50 | 50 | <template #renderItem="{ item }">
|
51 |
| - {{ item }} |
52 | 51 | <List.Item v-bind:style="{ padding: '6px' }">
|
53 | 52 | <TimeseriesChart
|
54 |
| - :keyStr="item.key" |
55 | 53 | :entityType="props.entityType"
|
56 | 54 | :entityId="props.entityId"
|
57 | 55 | :kvEntity="item"
|
|
88 | 86 | import AttributeModal from './attributeFrom.vue';
|
89 | 87 | import DeleteModal from './delete.vue';
|
90 | 88 | import { DataType } from '/@/enums/thingsModelEnum';
|
| 89 | + import { isNull } from '/@/utils/is'; |
91 | 90 | const LATEST_TELEMETRY = 'LATEST_TELEMETRY';
|
92 | 91 |
|
93 | 92 | const props = defineProps({
|
|
327 | 326 | }
|
328 | 327 |
|
329 | 328 | 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 | + }); |
336 | 340 | }
|
337 | 341 |
|
338 | 342 | function handleDelete(data: any) {
|
|
0 commit comments