diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue index 73d83549..709b06ec 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue @@ -50,13 +50,14 @@ style="margin-left: 5xp; width: 130px" placeholder="请选择项目类型" size="small" + @change="getTableFilterList" > diff --git a/src/views/iot/video/gbsScreen/modules/screenRecord.js b/src/views/iot/video/gbsScreen/modules/screenRecord.js index a19bab59..a24e3f00 100644 --- a/src/views/iot/video/gbsScreen/modules/screenRecord.js +++ b/src/views/iot/video/gbsScreen/modules/screenRecord.js @@ -22,7 +22,16 @@ export function init(list = []) { if (cook) { for(let i in treeChildList) { if (treeChildList[i].devChannel === cook['devChannel'] && treeChildList[i].devId === cook['devId']) { - newResult[idx] = cook + let record = treeChildList[i]; + newResult[idx] = Object.assign(cook, { + devChannel: record.devChannel || record.devChannel, + devId: record.devId, + https: record.https, + siteM7sHost: record.siteM7sHost, + siteM7sPort: record.siteM7sPort, + siteM7sVersion: record.siteM7sVersion, + treeId: record.treeId, + }) } } } else {