Commit b6a5b9eb53e4b9ee450e8f61c896c290efdf1815
Merge branch 'fix/board-style' into 'main_dev'
fix: 修改实时数据表格的样式 See merge request yunteng/thingskit-front!776
Showing
2 changed files
with
3 additions
and
2 deletions
... | ... | @@ -61,6 +61,7 @@ |
61 | 61 | showTableSetting: false, |
62 | 62 | canResize: true, |
63 | 63 | size: 'small', |
64 | + maxHeight: 144, | |
64 | 65 | columns, |
65 | 66 | }); |
66 | 67 | |
... | ... | @@ -136,7 +137,7 @@ |
136 | 137 | }); |
137 | 138 | const resize = async () => { |
138 | 139 | const { height } = unref(getContainerSize); |
139 | - height && setProps({ scroll: { x: 190, y: height - 120 } }); | |
140 | + height && setProps({ maxHeight: height - 100, scroll: { x: 470, y: height - 100 } }); | |
140 | 141 | |
141 | 142 | await nextTick(); |
142 | 143 | redoHeight(); | ... | ... |
... | ... | @@ -144,7 +144,7 @@ |
144 | 144 | forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => { |
145 | 145 | list.time = timespan || list.time; |
146 | 146 | series.value.forEach((item) => { |
147 | - if (item.id === deviceId && item.attribute === attribute && value) { | |
147 | + if (item.id === deviceId && item.attribute === attribute) { | |
148 | 148 | item.data.push({ |
149 | 149 | name: formatToDateTime(list.time, 'YYYY-MM-DD HH:mm:ss'), |
150 | 150 | value: value, | ... | ... |