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

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>

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
@@ -290,7 +290,7 @@
           this.$nextTick(() => {
             this.$refs.timeline && this.$refs.timeline.init()
           })
-        }, 60)
+        }, 260)
       },
 
       screenshots () {

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="家庭收支情况">