Skip to content

蒋秀川 / miniProject

Go to a project
Commit b7e1d463 by 李乾广
Options

修改bug

1 parent cedde8f8
Inline Side-by-side
Showing 3 changed files with 20 additions and 16 deletions
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">
<vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :controlAutoHide="false" :showPtz="false"/> <vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :hideControls="true" :showPtz="false"/>
</div> </div>
<!-- 时间线组件 --> <!-- 时间线组件 -->
<div class="extension-time-box"> <div class="extension-time-box">
...@@ -17,6 +17,9 @@ import vionPlayer from '@/components/vionPlayer'; ...@@ -17,6 +17,9 @@ import vionPlayer from '@/components/vionPlayer';
import videoTime from './videoTime'; import videoTime from './videoTime';
import moment from "moment"; import moment from "moment";
import tourApi from '@/api'; import tourApi from '@/api';
import {
Toast
} from 'vant';
/** /**
* 此部分负责： * 此部分负责：
* 1. iframe通信postmessage * 1. iframe通信postmessage
...@@ -89,10 +92,7 @@ export default { ...@@ -89,10 +92,7 @@ export default {
tourApi.ptzStart(par).then(res => { tourApi.ptzStart(par).then(res => {
console.log(res) console.log(res)
if(res.data&&res.data.code != 200) { if(res.data&&res.data.code != 200) {
this.$message({ Toast.fail(res.data.msg||'云台当前操作失败');
message: res.data.msg||'云台当前操作失败',
type: 'warning'
});
} }
}) })
} }
......
h5/src/views/pc/index.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<vion-player v-if="videoObj.gateUnid" ref="vionPlayer" :watermarkText="videoObj.watermarkText" :controlAutoHide="controlAutoHide" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp"/> <vion-player v-if="videoObj.gateUnid" ref="vionPlayer" :watermarkText="videoObj.watermarkText" :hideControls="hideControls" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp"/>
<div class="cameraTool" v-show="isShowJT"> <div class="cameraTool" v-show="isShowJT">
<p class="screenshot" @click="screenshot()"><i class="el-icon-camera"></i></p> <p class="screenshot" @click="screenshot()"><i class="el-icon-camera"></i></p>
</div> </div>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<vion-player ref="vionPlayer0" v-if="videoArrObj[0]" :watermarkText="videoArrObj[0].watermarkText" :controlAutoHide="controlAutoHide" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp0"/> <vion-player ref="vionPlayer0" v-if="videoArrObj[0]" :watermarkText="videoArrObj[0].watermarkText" :hideControls="hideControls" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp0"/>
<div class="cameraTool" v-show="isShowJT&&videoArrObj[0]"> <div class="cameraTool" v-show="isShowJT&&videoArrObj[0]">
<p class="screenshot" @click="screenshot(0)"><i class="el-icon-camera"></i></p> <p class="screenshot" @click="screenshot(0)"><i class="el-icon-camera"></i></p>
</div> </div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<vion-player ref="vionPlayer1" v-if="videoArrObj[1]" :watermarkText="videoArrObj[1].watermarkText" :controlAutoHide="controlAutoHide" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp1"/> <vion-player ref="vionPlayer1" v-if="videoArrObj[1]" :watermarkText="videoArrObj[1].watermarkText" :hideControls="hideControls" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp1"/>
<div class="cameraTool" v-show="isShowJT&&videoArrObj[1]"> <div class="cameraTool" v-show="isShowJT&&videoArrObj[1]">
<p class="screenshot" @click="screenshot(1)"><i class="el-icon-camera"></i></p> <p class="screenshot" @click="screenshot(1)"><i class="el-icon-camera"></i></p>
</div> </div>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<vion-player ref="vionPlayer2" v-if="videoArrObj[2]" :watermarkText="videoArrObj[2].watermarkText" :controlAutoHide="controlAutoHide" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp2"/> <vion-player ref="vionPlayer2" v-if="videoArrObj[2]" :watermarkText="videoArrObj[2].watermarkText" :hideControls="hideControls" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp2"/>
<div class="cameraTool" v-show="isShowJT&&videoArrObj[2]"> <div class="cameraTool" v-show="isShowJT&&videoArrObj[2]">
<p class="screenshot" @click="screenshot(2)"><i class="el-icon-camera"></i></p> <p class="screenshot" @click="screenshot(2)"><i class="el-icon-camera"></i></p>
</div> </div>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<vion-player ref="vionPlayer3" v-if="videoArrObj[3]" :watermarkText="videoArrObj[3].watermarkText" :controlAutoHide="controlAutoHide" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp3"/> <vion-player ref="vionPlayer3" v-if="videoArrObj[3]" :watermarkText="videoArrObj[3].watermarkText" :hideControls="hideControls" :showPtz="isNoBack&&showPtz?true:false" @ptz-control="panTiltControlComp3"/>
<div class="cameraTool" v-show="isShowJT&&videoArrObj[3]"> <div class="cameraTool" v-show="isShowJT&&videoArrObj[3]">
<p class="screenshot" @click="screenshot(3)"><i class="el-icon-camera"></i></p> <p class="screenshot" @click="screenshot(3)"><i class="el-icon-camera"></i></p>
</div> </div>
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
height:'',// 设置组件高度 height:'',// 设置组件高度
isShowJT:false,// 是否显示截图按钮，默认为false isShowJT:false,// 是否显示截图按钮，默认为false
isShowSplit:true,// 是否支持四分屏，默认为true isShowSplit:true,// 是否支持四分屏，默认为true
controlAutoHide:true,// 是否显示视频操作区，默认为true hideControls:false,// 是否显示视频操作区，默认为false
showPtz:true,// 是否显示视频操作区中的云台控制，默认为true showPtz:true,// 是否显示视频操作区中的云台控制，默认为true
} }
}, },
...@@ -158,8 +158,8 @@ export default { ...@@ -158,8 +158,8 @@ export default {
if(obj.isShowSplit !== undefined&&obj.isShowSplit !== null) { if(obj.isShowSplit !== undefined&&obj.isShowSplit !== null) {
this.isShowSplit = obj.isShowSplit this.isShowSplit = obj.isShowSplit
} }
if(obj.controlAutoHide !== undefined&&obj.controlAutoHide !== null) { if(obj.hideControls !== undefined&&obj.hideControls !== null) {
this.controlAutoHide = obj.controlAutoHide this.hideControls = obj.hideControls
} }
if(obj.showPtz !== undefined&&obj.showPtz !== null) { if(obj.showPtz !== undefined&&obj.showPtz !== null) {
this.showPtz = obj.showPtz this.showPtz = obj.showPtz
...@@ -236,10 +236,14 @@ export default { ...@@ -236,10 +236,14 @@ export default {
} }
}, },
allVideoExitFullScreen(){ allVideoExitFullScreen(){
this.isFullScreen = false // 暴露退出全屏方法
// this.isFullScreen = false
}, },
allVideoFullScreen(val){ allVideoFullScreen(val){
this.isFullScreen = true // 暴露全屏方法
// this.isFullScreen = true
}, },
// 四分屏，单屏切换 // 四分屏，单屏切换
splitScreenChange(val) { splitScreenChange(val) {
......
h5/src/views/pc/pcdemo.vue
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
height:'',// 设置组件高度 height:'',// 设置组件高度
isShowJT:false,// 是否显示截图按钮，默认为false isShowJT:false,// 是否显示截图按钮，默认为false
isShowSplit:true,// 是否支持四分屏，默认为true isShowSplit:true,// 是否支持四分屏，默认为true
controlAutoHide:true,// 是否显示视频操作区，默认为true hideControls:false,// 是否显示视频操作区，默认为false
showPtz:true,// 是否显示视频操作区中的云台控制，默认为true showPtz:true,// 是否显示视频操作区中的云台控制，默认为true
}) })
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!