Showing
1 changed file
with
17 additions
and
1 deletions
@@ -150,9 +150,11 @@ | @@ -150,9 +150,11 @@ | ||
150 | if (!data?.data) return; | 150 | if (!data?.data) return; |
151 | const tableList = ref<any>( | 151 | const tableList = ref<any>( |
152 | data?.data?.map((item) => { | 152 | data?.data?.map((item) => { |
153 | + const values = | ||
154 | + unref(getDesign).dataSource.filter((item1) => item1.id === item.entityId.id) || []; | ||
153 | return { | 155 | return { |
154 | time: item.createdTime, | 156 | time: item.createdTime, |
155 | - device: item.originatorName, | 157 | + device: values[0].deviceName || item.originatorName, |
156 | severity: item.severity, | 158 | severity: item.severity, |
157 | type: item.type, | 159 | type: item.type, |
158 | status: item.status, | 160 | status: item.status, |
@@ -165,6 +167,20 @@ | @@ -165,6 +167,20 @@ | ||
165 | useCustomDataFetch(props, transformMessage, updateFn); | 167 | useCustomDataFetch(props, transformMessage, updateFn); |
166 | 168 | ||
167 | onMounted(async () => { | 169 | onMounted(async () => { |
170 | + // const deviceIds = unref(getDesign).dataSource.map((item) => item.id); | ||
171 | + // let { startTs, endTs, time, pageSize }: any = unref(alarmForm) || {}; | ||
172 | + // if (!startTs || !endTs) { | ||
173 | + // startTs = Date.now() - time; | ||
174 | + // endTs = Date.now(); | ||
175 | + // } | ||
176 | + // const values = { | ||
177 | + // deviceIds, | ||
178 | + // page: 1, | ||
179 | + // pageSize, | ||
180 | + // startTime: Number(startTs), | ||
181 | + // endTime: Number(endTs), | ||
182 | + // }; | ||
183 | + | ||
168 | await nextTick(); | 184 | await nextTick(); |
169 | resize(); | 185 | resize(); |
170 | }); | 186 | }); |