xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '1' (#118) from pc-master into portal 

Reviewed-on: #118
portal
xiaomeng 2024-02-28 00:59:15 +00:00
parent b5a6a2c4ca 2d52e6a8cb
commit bacbf18ad3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/page/realTime.vue
View File

@ -81,7 +81,8 @@
<div class="left-view" v-if="deviceName != 30"> <div class="left-view" v-if="deviceName != 30">
<div ref="monitor" class="monitor" id="monitor"> <div ref="monitor" class="monitor" id="monitor">
<!-- <video ref="videoPlayer" class="video-js" id="video-js"></video> --> <!-- <video ref="videoPlayer" class="video-js" id="video-js"></video> -->
<div ref="videoPlayer" class="video-js" id="video-js"></div> <img v-if="imgUrl" style="width: 100%;height: 100%;" :src="imgUrl" alt="">
<div v-else ref="videoPlayer" class="video-js" id="video-js"></div>
</div> </div>
</div> </div>
<div class="right" id="realTime-line"></div> <div class="right" id="realTime-line"></div>
@ -484,6 +485,7 @@ export default {
indexs: 1, indexs: 1,
player: null, player: null,
url: '', url: '',
imgUrl:'',
timer: null, timer: null,
deviceName: 1, deviceName: 1,
deviceState: 1, deviceState: 1,
@ -1004,6 +1006,8 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.url = res.data.data.ezopen this.url = res.data.data.ezopen
this.createVideoNew(res.data.data.accesstoken) this.createVideoNew(res.data.data.accesstoken)
}else{
this.imgUrl=nowDevice.hls
} }
}) })
} }
@ -1118,6 +1122,8 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.url = res.data.data.ezopen this.url = res.data.data.ezopen
this.createVideoNew(res.data.data.accesstoken) this.createVideoNew(res.data.data.accesstoken)
}else{
this.imgUrl=nowDevice.hls
} }
}) })
} }

6
src/views/page/videoMonitoring.vue
View File

@ -9,7 +9,8 @@
<div class="left-view" v-if="deviceName != 30"> <div class="left-view" v-if="deviceName != 30">
<div ref="monitor" class="monitor" id="monitor"> <div ref="monitor" class="monitor" id="monitor">
<!-- <video ref="videoPlayer" class="video-js" id="video-js"></video> --> <!-- <video ref="videoPlayer" class="video-js" id="video-js"></video> -->
<div ref="videoPlayer" class="video-js" id="video-js"></div> <img v-if="imgUrl" class="video-js" :src="imgUrl" alt="">
<div v-else ref="videoPlayer" class="video-js" id="video-js"></div>
<div class="video-control"> <div class="video-control">
<div class="video-btn-big"> <div class="video-btn-big">
<div class="top" @mousedown="downStart(0)"> <div class="top" @mousedown="downStart(0)">
@ -73,6 +74,7 @@ export default {
deviceState: 1, deviceState: 1,
statusInterval: null,//status状态的Interval statusInterval: null,//status状态的Interval
player: null, player: null,
imgUrl:'',
url: '', url: '',
nowNum: -1, nowNum: -1,
} }
@ -212,6 +214,8 @@ export default {
this.url = res.data.data.ezopen this.url = res.data.data.ezopen
this.accesstoken = res.data.data.accesstoken this.accesstoken = res.data.data.accesstoken
this.createVideoNew(res.data.data.accesstoken) this.createVideoNew(res.data.data.accesstoken)
}else{
this.imgUrl=nowDevice.hls
} }
}) })
} }