From b5a1e98e49e9f159d9abee31301ebd4383f66f23 Mon Sep 17 00:00:00 2001
From: nieliSunboy <329261568@qq.com>
Date: Mon, 13 Mar 2023 11:01:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=90=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E5=B1=8F=E5=B1=95=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81=E5=85=B3=E9=97=AD=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E5=B7=A6=E4=BE=A7=E7=8A=B6=E6=80=81=E4=B8=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profileV2/DeviceManage/EDeviceChildren.vue        |  3 ++-
 src/views/iot/video/gbsScreen/modules/screenRecord.js | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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"
         >
           <el-option
             v-for="dict in projectModelList"
             :key="dict.prodKey"
             :label="dict.modelName"
             :value="dict.prodKey"
-            @change="getTableFilterList"
+           
           ></el-option>
         </el-select>
       </div>
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 {