Compare commits
No commits in common. "3f0ad6963adfc553827ca7234ce1f52511fc98d1" and "ac67d51f9ce3e9d5bccbdfa7492a5241fa586275" have entirely different histories.
3f0ad6963a
...
ac67d51f9c
|
@ -2047,7 +2047,6 @@
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
position: relative;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.realTime .page-content .realTime-bottom .left-view > div .video-js {
|
.realTime .page-content .realTime-bottom .left-view > div .video-js {
|
||||||
|
@ -2055,12 +2054,6 @@
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.realTime .page-content .realTime-bottom .left-view > div #video-js {
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.realTime .page-content .realTime-bottom .left-view > div .video-control {
|
.realTime .page-content .realTime-bottom .left-view > div .video-control {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2185,17 +2185,12 @@
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
position: relative;
|
|
||||||
|
|
||||||
.video-js {
|
.video-js {
|
||||||
width: calc(100% - 400px);
|
width: calc(100% - 400px);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
#video-js{
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
.video-control {
|
.video-control {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
@ -10,10 +10,7 @@
|
||||||
<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="">
|
<img v-if="imgUrl" class="video-js" :src="imgUrl" alt="">
|
||||||
<div v-if="!imgUrl" ref="videoPlayer" class="video-js">
|
<div v-else ref="videoPlayer" class="video-js" id="video-js"></div>
|
||||||
<div id="video-js"></div>
|
|
||||||
</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)">
|
||||||
|
@ -77,7 +74,7 @@ export default {
|
||||||
deviceState: 1,
|
deviceState: 1,
|
||||||
statusInterval: null,//status状态的Interval
|
statusInterval: null,//status状态的Interval
|
||||||
player: null,
|
player: null,
|
||||||
imgUrl: '',
|
imgUrl:'',
|
||||||
url: '',
|
url: '',
|
||||||
nowNum: -1,
|
nowNum: -1,
|
||||||
}
|
}
|
||||||
|
@ -170,11 +167,11 @@ export default {
|
||||||
// .catch(error => {
|
// .catch(error => {
|
||||||
// console.error(error);
|
// console.error(error);
|
||||||
// });
|
// });
|
||||||
this.api.cameraStart(nowDevice.cameraSerialNumber, nowDevice.cameraChannelNumber, num).then(res => {
|
this.api.cameraStart(nowDevice.cameraSerialNumber,nowDevice.cameraChannelNumber,num).then(res => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
that.upEnd()
|
that.upEnd()
|
||||||
}, 10000);
|
}, 10000);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
upEnd() {
|
upEnd() {
|
||||||
const store = this.$store.state
|
const store = this.$store.state
|
||||||
|
@ -201,7 +198,7 @@ export default {
|
||||||
// });
|
// });
|
||||||
if (num != -1) {
|
if (num != -1) {
|
||||||
this.api.cameraStop(nowDevice.cameraSerialNumber, nowDevice.cameraChannelNumber, num).then(res => {
|
this.api.cameraStop(nowDevice.cameraSerialNumber, nowDevice.cameraChannelNumber, num).then(res => {
|
||||||
this.nowNum = -1
|
this.nowNum=-1
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -222,12 +219,6 @@ export default {
|
||||||
width: divW, // 播放容器宽高 也可以直接设置成数字 如 1920 单位是px
|
width: divW, // 播放容器宽高 也可以直接设置成数字 如 1920 单位是px
|
||||||
height: divH, // 播放容器宽高 也可以直接设置成数字 如 1080 单位是px
|
height: divH, // 播放容器宽高 也可以直接设置成数字 如 1080 单位是px
|
||||||
})
|
})
|
||||||
window.onresize = () => {
|
|
||||||
this.player.reSize(
|
|
||||||
this.$refs.videoPlayer.clientWidth,
|
|
||||||
this.$refs.videoPlayer.clientHeight
|
|
||||||
);
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
dataInit() {
|
dataInit() {
|
||||||
const store = this.$store.state
|
const store = this.$store.state
|
||||||
|
@ -243,9 +234,9 @@ 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 {
|
}else{
|
||||||
this.imgUrl = nowDevice.hls
|
this.imgUrl=nowDevice.hls
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -254,3 +245,5 @@ export default {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss"></style>
|
<style lang="scss"></style>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue