Skip to content

蒋秀川 / miniProject

Go to a project
Commit cedde8f8 by Tianqing Liu
Options

Merge branch 'qxh-master' of http://git.keliuyun.com:55676/jiaxiuc123/miniProject into qxh-master

2 parents 8db59d84 0f116822
Inline Side-by-side
Showing 3 changed files with 22 additions and 22 deletions
h5/src/views/pc/pcdemo.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<!-- 添加视频测试 --> <!-- 添加视频测试 -->
<div> <div>
<el-button type="primary" @click="addPlayer({gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控</el-button> <el-button type="primary" @click="addPlayer({gateUnid: '85de13a8-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控</el-button>
<el-button type="primary" @click="addPlayer({gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd',watermarkText:'Demo Store'})">Demo Store--客流相机-入口1</el-button> <el-button type="primary" @click="addPlayer({gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd',watermarkText:'Demo Store'})">Demo Store--客流相机-入口1</el-button>
</div> </div>
<indexPlayer ref="iframe"></indexPlayer> <indexPlayer ref="iframe"></indexPlayer>
...@@ -29,9 +29,9 @@ export default { ...@@ -29,9 +29,9 @@ export default {
isShowTime:true,// 是否显示时间操作区，默认为true isShowTime:true,// 是否显示时间操作区，默认为true
height:'',// 设置组件高度 height:'',// 设置组件高度
isShowJT:false,// 是否显示截图按钮，默认为false isShowJT:false,// 是否显示截图按钮，默认为false
isShowSplit:false,// 是否支持四分屏，默认为true isShowSplit:true,// 是否支持四分屏，默认为true
controlAutoHide:false,// 是否显示视频操作区，默认为true controlAutoHide:true,// 是否显示视频操作区，默认为true
showPtz:false,// 是否显示视频操作区中的云台控制，默认为true showPtz:true,// 是否显示视频操作区中的云台控制，默认为true
}) })
}, },
methods: { methods: {
......
h5/src/views/pc/timeline-canvas.vue
...@@ -187,14 +187,14 @@ export default { ...@@ -187,14 +187,14 @@ export default {
//"横屏"; //"横屏";
} }
//有时屏幕尺寸变化了，而容器的尺寸还未改变的情况下的处理 //有时屏幕尺寸变化了，而容器的尺寸还未改变的情况下的处理
if (this.canvas.style.width === this.canvas.parentElement.clientWidth + "px") { // if (this.canvas.style.width === this.canvas.parentElement.clientWidth + "px") {
setTimeout(() => { // setTimeout(() => {
this.resize(); // this.resize();
}, 10); // }, 10);
} else { // } else {
//重新初始化 // //重新初始化
this.init(); // this.init();
} // }
}, },
//进度条停止播放 //进度条停止播放
stop() { stop() {
......
h5/src/views/pc/videoTime.vue
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</el-dropdown> </el-dropdown>
<i class="el-icon-arrow-right"></i> <i class="el-icon-arrow-right"></i>
</div> </div>
<span @click="fullScreen" class="fullScreen" v-if="!isFullScreen"><i class="el-icon-full-screen"></i></span> <!-- <span @click="fullScreen" class="fullScreen" v-if="!isFullScreen"><i class="el-icon-full-screen"></i></span> -->
<span @click="exitFullScreen" class="fullScreen" v-if="isFullScreen"><i class="el-icon-full-screen"></i></span> <!-- <span @click="exitFullScreen" class="fullScreen" v-if="isFullScreen"><i class="el-icon-full-screen"></i></span> -->
<!-- 播放时间显示 --> <!-- 播放时间显示 -->
<!-- <div class="play-time-show">{{nowPlayTime}}</div> --> <!-- <div class="play-time-show">{{nowPlayTime}}</div> -->
<!-- 返回实时按钮 --> <!-- 返回实时按钮 -->
...@@ -134,13 +134,13 @@ export default { ...@@ -134,13 +134,13 @@ export default {
}, },
mounted() { mounted() {
let that = this let that = this
window.addEventListener('resize', function () { // window.addEventListener('resize', function () {
if (!that.isFullScreenFun()) { // if (!that.isFullScreenFun()) {
// 非全屏状态 // // 非全屏状态
//业务逻辑 // //业务逻辑
that.exitFullScreen() // that.exitFullScreen()
} // }
}); // });
window.addEventListener('keydown', this.timeInputKeyCode) window.addEventListener('keydown', this.timeInputKeyCode)
this.timeRange = [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')] this.timeRange = [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')]
// this.markTime = [{ // this.markTime = [{
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
this.initDay() this.initDay()
}, },
beforeDestroy() { beforeDestroy() {
window.removeEventListener("resize", this.isFullScreenFun, true); // window.removeEventListener("resize", this.isFullScreenFun, true);
window.removeEventListener("keydown", this.timeInputKeyCode, true); window.removeEventListener("keydown", this.timeInputKeyCode, true);
this.stopPlay() this.stopPlay()
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!