|
@@ -106,7 +106,7 @@
|
|
|
<TVWall ref="TVWall"></TVWall>
|
|
|
<el-dialog :title="cameraTitle" :visible.sync="cameraVisible" v-if="cameraVisible" customClass="videoCustomWidth"
|
|
|
@close="cancelEventLocationShow()">
|
|
|
- <div style="width:770px;height:445px;position:relative;">
|
|
|
+ <div style="width:1020px;height:625px;position:relative;">
|
|
|
<!--视频窗口展示---海康-->
|
|
|
<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>
|
|
|
</div>
|
|
@@ -610,7 +610,7 @@ export default {
|
|
|
that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
|
setTimeout(function() {
|
|
|
- that.playhk('33e7f21691a843f6bcb4866efebe088b')
|
|
|
+ that.playhk(newResponse.data.channelCode)
|
|
|
}, 5000)
|
|
|
})
|
|
|
|
|
@@ -642,7 +642,7 @@ export default {
|
|
|
cbIntegrationCallBack: cbIntegrationCallBack
|
|
|
})
|
|
|
|
|
|
- that.oWebControl.JS_CreateWnd('playWnd', 768, 462).then(function() { //JS_CreateWnd创建视频播放窗口,宽高可设定
|
|
|
+ that.oWebControl.JS_CreateWnd('playWnd', 1020, 600).then(function() { //JS_CreateWnd创建视频播放窗口,宽高可设定
|
|
|
that.init(newappkey,newloginIp,newsecret,newloginPort) // 创建播放实例成功后初始化
|
|
|
})
|
|
|
}, function() { // 启动插件服务失败
|
|
@@ -729,7 +729,7 @@ export default {
|
|
|
buttonIDs: buttonIDs //自定义工具条按钮
|
|
|
})
|
|
|
}).then(function(oData) {
|
|
|
- that.oWebControl.JS_Resize(768, 462) // 初始化后resize一次,规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
|
|
|
+ that.oWebControl.JS_Resize(1020, 600) // 初始化后resize一次,规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
|
|
|
})
|
|
|
})
|
|
|
},
|
|
@@ -762,7 +762,7 @@ export default {
|
|
|
|
|
|
// 推送消息
|
|
|
function cbIntegrationCallBack(oData) {
|
|
|
- showCBInfo(JSON.stringify(oData.responseMsg))
|
|
|
+ console.log(JSON.stringify(oData.responseMsg))
|
|
|
}
|
|
|
</script>
|
|
|
|
|
@@ -771,9 +771,9 @@ function cbIntegrationCallBack(oData) {
|
|
|
@import '@/assets/styles/base.scss';
|
|
|
|
|
|
.playWnd {
|
|
|
- margin: -13px 0 0 -15px;
|
|
|
- width: 768px; /*播放容器的宽和高设定*/
|
|
|
- height: 462px;
|
|
|
+ margin: -12px 0 0 6px;
|
|
|
+ width: 1020px; /*播放容器的宽和高设定*/
|
|
|
+ height: 600px;
|
|
|
border: 1px solid red;
|
|
|
}
|
|
|
</style>
|