kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-04-28 14:30:42 +08:00
parent 97759ee9d2 ea42e0e53a
commit dc2e2ff079
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/IntelligentSecurity/AppISManage/AppISManage.vue
View File

@@ -8,7 +8,7 @@
<img slot="prefix" src="https://cdn.cunwuyun.cn/slw2.0/images/fp.png"> <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-option v-for="(op,i) in splitOps" :key="i" v-bind="op" />
</el-select> </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"> <img src="https://cdn.cunwuyun.cn/slw2.0/images/xt.png">
<span>{{ isShowBar ? '视频协同' : '取消协同' }}</span> <span>{{ isShowBar ? '视频协同' : '取消协同' }}</span>
</div> </div>

4
packages/IntelligentSecurity/components/AiSlwVideo.vue
View File

@@ -245,7 +245,7 @@
}, },
changePlayStatus () { changePlayStatus () {
const subPage = document.querySelector(`#${this.id}`).contentWindow const subPage = document.querySelector(`#${this.iframeId}`).contentWindow
subPage.postMessage({ subPage.postMessage({
type: 'play', type: 'play',
value: this.isPause value: this.isPause
@@ -290,7 +290,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.timeline && this.$refs.timeline.init() this.$refs.timeline && this.$refs.timeline.init()
}) })
}, 60) }, 260)
}, },
screenshots () { screenshots () {

4
packages/jianping/AppHelpedResident/hrDetail.vue
View File

@@ -120,10 +120,10 @@
<el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item> <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item>
</div> </div>
<el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item> <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="图片"> <el-form-item label="图片">
<ai-uploader disabled v-model="detail.files"></ai-uploader> <ai-uploader disabled v-model="detail.files"></ai-uploader>
</el-form-item> </el-form-item> -->
</template> </template>
</ai-card> </ai-card>
<ai-card title="家庭收支情况"> <ai-card title="家庭收支情况">