Showing
1 changed file
with
12 additions
and
11 deletions
... | ... | @@ -168,12 +168,12 @@ |
168 | 168 | { |
169 | 169 | checked: false, |
170 | 170 | name: '告警', |
171 | - type: '1' | |
171 | + type: 1 | |
172 | 172 | }, |
173 | 173 | { |
174 | 174 | checked: false, |
175 | 175 | name: '正常', |
176 | - type: '0' | |
176 | + type: 0 | |
177 | 177 | } |
178 | 178 | ], |
179 | 179 | typeStatus: [{ |
... | ... | @@ -263,7 +263,7 @@ |
263 | 263 | this.loadData(this.page.num, { |
264 | 264 | deviceState: deviceState.type ? deviceState.type : undefined, |
265 | 265 | deviceType: deviceType.type ? deviceType.type : undefined, |
266 | - alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : | |
266 | + alarmStatus: alarmStatus.type === 0 || alarmStatus.type === 1 ? alarmStatus.type : | |
267 | 267 | undefined, |
268 | 268 | name: this.deviceName == null ? null : this.deviceName, |
269 | 269 | organizationId: this.orgId == null ? null : this.orgId |
... | ... | @@ -276,17 +276,18 @@ |
276 | 276 | let httpData = { |
277 | 277 | page: pageNo, |
278 | 278 | pageSize: 10, |
279 | - ...params | |
279 | + custom: { | |
280 | + load: false | |
281 | + }, | |
280 | 282 | }; |
283 | + const httpPostData = { | |
284 | + "deviceProfileIds": null, | |
285 | + ...params | |
286 | + } | |
281 | 287 | const { |
282 | 288 | total, |
283 | 289 | items |
284 | - } = await api.deviceApi.getDeviceApi({ | |
285 | - params: httpData, | |
286 | - custom: { | |
287 | - load: false | |
288 | - } | |
289 | - }) | |
290 | + } = await api.deviceApi.getDeviceApi(httpData, httpPostData) | |
290 | 291 | this.total = total; |
291 | 292 | uni.stopPullDownRefresh(); |
292 | 293 | this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数) |
... | ... | @@ -336,7 +337,7 @@ |
336 | 337 | this.loadData(1, { |
337 | 338 | deviceState: deviceState.type ? deviceState.type : undefined, |
338 | 339 | deviceType: deviceType.type ? deviceType.type : undefined, |
339 | - alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : | |
340 | + alarmStatus: alarmStatus.type === 0 || alarmStatus.type === 1 ? alarmStatus.type : | |
340 | 341 | undefined |
341 | 342 | }); |
342 | 343 | this.show = false; | ... | ... |