Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
gx_ma
2024-08-05 11:03:16 +08:00

View File

@@ -236,7 +236,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 12, pageSize: 13,
deviceName: null, deviceName: null,
productId: null, productId: null,
groupId: null, groupId: null,
@@ -393,7 +393,7 @@ export default {
this.getGroupList(); this.getGroupList();
listDeviceShort(this.queryParams).then((response) => { listDeviceShort(this.queryParams).then((response) => {
this.deviceList = response.rows; this.deviceList = response.rows;
this.total = response.total; this.total = response.total - 1;
// 订阅消息 // 订阅消息
if (this.deviceList && this.deviceList.length > 0) { if (this.deviceList && this.deviceList.length > 0) {
this.mqttSubscribe(this.deviceList); this.mqttSubscribe(this.deviceList);