From 476dec8d17f6fa07bb1d181dce297df5aa843d83 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 28 Apr 2022 11:50:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index ad823eb5..83eb6e6e 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -120,10 +120,10 @@
                     <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item>
                   </div>
                   <el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
-                  <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
+                  <!-- <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
                   <el-form-item label="图片">
                     <ai-uploader disabled v-model="detail.files"></ai-uploader>
-                  </el-form-item>
+                  </el-form-item> -->
                 </template>
               </ai-card>
               <ai-card title="家庭收支情况">

From 001fc94d954e2825a7ab311ba40fd2ed0581b629 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 28 Apr 2022 14:01:59 +0800
Subject: [PATCH 2/3] 29392

---
 packages/IntelligentSecurity/AppISManage/AppISManage.vue | 2 +-
 packages/IntelligentSecurity/components/AiSlwVideo.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
index 5cb2a019..36fff7a7 100644
--- a/packages/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
@@ -8,7 +8,7 @@
           <img slot="prefix" src="https://cdn.cunwuyun.cn/slw2.0/images/fp.png">
           <el-option v-for="(op,i) in splitOps" :key="i" v-bind="op" />
         </el-select>
-        <div class="headerBar-item" v-if="monitors.length > 1" @click="playbackUrls = [], isShowBar = !isShowBar" :class="[isShowBar ? '' : 'cancel-xt']">
+        <div class="headerBar-item" @click="playbackUrls = [], isShowBar = !isShowBar" :class="[isShowBar ? '' : 'cancel-xt']">
           <img src="https://cdn.cunwuyun.cn/slw2.0/images/xt.png">
           <span>{{ isShowBar ? '视频协同' : '取消协同' }}</span>
         </div>
diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/IntelligentSecurity/components/AiSlwVideo.vue
index 5a5530e1..1840cbaf 100644
--- a/packages/IntelligentSecurity/components/AiSlwVideo.vue
+++ b/packages/IntelligentSecurity/components/AiSlwVideo.vue
@@ -245,7 +245,7 @@
       },
 
       changePlayStatus () {
-        const subPage = document.querySelector(`#${this.id}`).contentWindow
+        const subPage = document.querySelector(`#${this.iframeId}`).contentWindow
         subPage.postMessage({
           type: 'play',
           value: this.isPause

From ea42e0e53af72d1c0f5cc632de98a59d715ea79d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 28 Apr 2022 14:26:44 +0800
Subject: [PATCH 3/3] 29391

---
 packages/IntelligentSecurity/components/AiSlwVideo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/IntelligentSecurity/components/AiSlwVideo.vue
index 1840cbaf..15147f6d 100644
--- a/packages/IntelligentSecurity/components/AiSlwVideo.vue
+++ b/packages/IntelligentSecurity/components/AiSlwVideo.vue
@@ -290,7 +290,7 @@
           this.$nextTick(() => {
             this.$refs.timeline && this.$refs.timeline.init()
           })
-        }, 60)
+        }, 260)
       },
 
       screenshots () {