zishuo/miniProject
1
0
Fork 0
mirror of http://git.keliuyun.com:55676/jiaxiuc123/miniProject.git synced 2025-12-24 12:38:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
liqianguang
2024-06-17 16:52:30 +08:00
parent 0ae8d46b24
commit b5ba3271ba
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
h5/src/components/vionPlayer/index.vue
View File

@@ -150,12 +150,15 @@ export default {
// 断线重连
playerIns.on(JessibucaPro.EVENTS.playFailedAndPaused, (e) => {
console.log('playFailedAndPaused', e);
let isLoad = window.localStorage.getItem('isLoad')
if(isLoad&&isLoad>0) {
window.localStorage.setItem('isLoad',0)
} else {
window.localStorage.setItem('isLoad',1)
window.location.reload();
let isOnlyBack = window.localStorage.getItem('isOnlyBack')
if(isOnlyBack&&isOnlyBack>0) {
let isLoad = window.localStorage.getItem('isLoad')
if(isLoad&&isLoad>0) {
window.localStorage.setItem('isLoad',0)
} else {
window.localStorage.setItem('isLoad',1)
window.location.reload();
}
}
// this.replay();
});
@@ -192,7 +195,7 @@ export default {
this._jessibuca.playback(url, getPlaybackConfig());
this.playerType = 'playback';
} else {
this._jessibuca.play(url+'123');
this._jessibuca.play(url);
this.playerType = 'live';
}
this.playOriginUrl = url;

23
h5/src/views/extension/index.vue
View File

@@ -1,6 +1,7 @@
<template>
<div class="extension-page">
<div class="j-player-wrapper">
<div class="description-text" v-if="params.description">{{params.description}}</div>
<vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :watermarkOpacity="params.watermarkOpacity" :hideControls="false" :showPtz="false" :isXCXPage="true" @magnificationChange="magnificationChange"/>
</div>
<!-- 时间线组件 -->
@@ -49,6 +50,7 @@ export default {
userKey:'',
restaurantId:'',
playbackTime:'',
description:'',
},
panTiltList:{
up:0,
@@ -152,6 +154,7 @@ export default {
this.dateFormatType = this.terminalType == 'ios'||this.terminalType == 'mac' ? 'YYYY/MM/DD':'YYYY-MM-DD';
if(this.params.gateUnid) {
if(this.params.playbackTime) {
window.localStorage.setItem('isOnlyBack',1)
let playbackTime = moment(this.params.playbackTime).format('YYYY-MM-DD HH:mm:ss')
let nowTime = moment(this.params.playbackTime).format('YYYY-MM-DD 23:59:59')
this.getVideoAddress(playbackTime,nowTime)
@@ -159,6 +162,7 @@ export default {
this.$refs.videoTimeRef.initBackTime(playbackTime);
})
} else {
window.localStorage.setItem('isOnlyBack',0)
this.getVideoAddress()
}
}
@@ -261,9 +265,9 @@ export default {
}, 5000);
// 跳转页面
// 测试环境
const strUrl = `http://dining-sit.huian365.com/camera/CameraReport?userKey=${this.params.userKey}&restaurantId=${this.params.restaurantId}&imgUrl=${encodeURIComponent(res.data.data)}`
// const strUrl = `http://dining-sit.huian365.com/camera/CameraReport?userKey=${this.params.userKey}&restaurantId=${this.params.restaurantId}&imgUrl=${encodeURIComponent(res.data.data)}`
// 生产环境
// const strUrl = `https://dining.huian365.com/camera/CameraReport?userKey=${this.params.userKey}&restaurantId=${this.params.restaurantId}&imgUrl=${encodeURIComponent(res.data.data)}`
const strUrl = `https://dining.huian365.com/camera/CameraReport?userKey=${this.params.userKey}&restaurantId=${this.params.restaurantId}&imgUrl=${encodeURIComponent(res.data.data)}`
window.location.href = strUrl
}else {
this.$message({
@@ -303,5 +307,18 @@ export default {
height: 16px;
z-index: 1000;
}
.description-text{
position: absolute;
z-index: 100;
top:15px;
right:0px;
background: rgba(255,0,0,0.4);
color: #fff;
padding:0px 10px;
height: 30px;
line-height: 30px;
font-size: 13px;
// border-top-left-radius: 5px;
// border-bottom-left-radius: 5px;
}
</style>