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

Compare commits

base: xiaomeng:bacbf18ad338b64932133171be44c5e95c7b571a
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:b5a6a2c4caa2e966d8910abec60cd931a8c5af70
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "bacbf18ad338b64932133171be44c5e95c7b571a" and "b5a6a2c4caa2e966d8910abec60cd931a8c5af70" have entirely different histories.
bacbf18ad3 ... b5a6a2c4ca

2 changed files with 3 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -81,8 +81,7 @@
<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> -->
<img v-if="imgUrl" style="width: 100%;height: 100%;" :src="imgUrl" alt=""> <div ref="videoPlayer" class="video-js" id="video-js"></div>
<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>
@ -485,7 +484,6 @@ 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,
@ -1006,8 +1004,6 @@ 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
} }
}) })
} }
@ -1122,8 +1118,6 @@ 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
} }
}) })
} }

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

@ -9,8 +9,7 @@
<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> -->
<img v-if="imgUrl" class="video-js" :src="imgUrl" alt=""> <div ref="videoPlayer" class="video-js" id="video-js"></div>
<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)">
@ -74,7 +73,6 @@ 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,
} }
@ -214,9 +212,7 @@ 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
}
}) })
} }
}, },