Skip to content

蒋秀川 / miniProject

Go to a project
Commit b5ba3271 by 李乾广
Options

修改bug

1 parent 0ae8d46b
Inline Side-by-side
Showing 2 changed files with 30 additions and 10 deletions
h5/src/components/vionPlayer/index.vue
...@@ -150,12 +150,15 @@ export default { ...@@ -150,12 +150,15 @@ export default {
// 断线重连 // 断线重连
playerIns.on(JessibucaPro.EVENTS.playFailedAndPaused, (e) => { playerIns.on(JessibucaPro.EVENTS.playFailedAndPaused, (e) => {
console.log('playFailedAndPaused', e); console.log('playFailedAndPaused', e);
let isLoad = window.localStorage.getItem('isLoad') let isOnlyBack = window.localStorage.getItem('isOnlyBack')
if(isLoad&&isLoad>0) { if(isOnlyBack&&isOnlyBack>0) {
window.localStorage.setItem('isLoad',0) let isLoad = window.localStorage.getItem('isLoad')
} else { if(isLoad&&isLoad>0) {
window.localStorage.setItem('isLoad',1) window.localStorage.setItem('isLoad',0)
window.location.reload(); } else {
window.localStorage.setItem('isLoad',1)
window.location.reload();
}
} }
// this.replay(); // this.replay();
}); });
...@@ -192,7 +195,7 @@ export default { ...@@ -192,7 +195,7 @@ export default {
this._jessibuca.playback(url, getPlaybackConfig()); this._jessibuca.playback(url, getPlaybackConfig());
this.playerType = 'playback'; this.playerType = 'playback';
} else { } else {
this._jessibuca.play(url+'123'); this._jessibuca.play(url);
this.playerType = 'live'; this.playerType = 'live';
} }
this.playOriginUrl = url; this.playOriginUrl = url;
......
h5/src/views/extension/index.vue
<template> <template>
<div class="extension-page"> <div class="extension-page">
<div class="j-player-wrapper"> <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"/> <vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :watermarkOpacity="params.watermarkOpacity" :hideControls="false" :showPtz="false" :isXCXPage="true" @magnificationChange="magnificationChange"/>
</div> </div>
<!-- 时间线组件 --> <!-- 时间线组件 -->
...@@ -49,6 +50,7 @@ export default { ...@@ -49,6 +50,7 @@ export default {
userKey:'', userKey:'',
restaurantId:'', restaurantId:'',
playbackTime:'', playbackTime:'',
description:'',
}, },
panTiltList:{ panTiltList:{
up:0, up:0,
...@@ -152,6 +154,7 @@ export default { ...@@ -152,6 +154,7 @@ export default {
this.dateFormatType = this.terminalType == 'ios'||this.terminalType == 'mac' ? 'YYYY/MM/DD':'YYYY-MM-DD'; this.dateFormatType = this.terminalType == 'ios'||this.terminalType == 'mac' ? 'YYYY/MM/DD':'YYYY-MM-DD';
if(this.params.gateUnid) { if(this.params.gateUnid) {
if(this.params.playbackTime) { if(this.params.playbackTime) {
window.localStorage.setItem('isOnlyBack',1)
let playbackTime = moment(this.params.playbackTime).format('YYYY-MM-DD HH:mm:ss') 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') let nowTime = moment(this.params.playbackTime).format('YYYY-MM-DD 23:59:59')
this.getVideoAddress(playbackTime,nowTime) this.getVideoAddress(playbackTime,nowTime)
...@@ -159,6 +162,7 @@ export default { ...@@ -159,6 +162,7 @@ export default {
this.$refs.videoTimeRef.initBackTime(playbackTime); this.$refs.videoTimeRef.initBackTime(playbackTime);
}) })
} else { } else {
window.localStorage.setItem('isOnlyBack',0)
this.getVideoAddress() this.getVideoAddress()
} }
} }
...@@ -261,9 +265,9 @@ export default { ...@@ -261,9 +265,9 @@ export default {
}, 5000); }, 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 window.location.href = strUrl
}else { }else {
this.$message({ this.$message({
...@@ -303,5 +307,18 @@ export default { ...@@ -303,5 +307,18 @@ export default {
height: 16px; height: 16px;
z-index: 1000; 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> </style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!