admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' into dev-cjw

Browse Source
This commit is contained in:
Vce 2024-03-27 16:46:53 +08:00
commit 1fe7366c1d
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/videoModule/playBack/playBack.vue
View File

@ -405,7 +405,6 @@ export default {
//关闭视频窗口 //关闭视频窗口
closeWindow() { closeWindow() {
if (this.oWebControl != null) {
this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
this.oWebControl.JS_Disconnect().then( this.oWebControl.JS_Disconnect().then(
() => { () => {
@ -417,7 +416,6 @@ export default {
); );
} }
} }
}
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

11
src/views/projectFront/replayVideoManage/components/playBack/playBack.vue
View File

@ -10,7 +10,6 @@ export default {
data() { data() {
return { return {
videoType:"", videoType:"",
locationValue:1,
//声明公用变量 //声明公用变量
initCount: 0, initCount: 0,
//初始化参数 //初始化参数
@ -204,7 +203,7 @@ export default {
var buttonIDs = var buttonIDs =
"0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //自定义工具条按钮 "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //自定义工具条按钮
////////////////////////////////// 请自行修改以上变量值 //////////////////////////////////// ////////////////////////////////// 请自行修改以上变量值 ////////////////////////////////////
var toolBarButtonIDs = "2048,2049,2050,2304,2306,2307,2308,2309,4096,4608,4097,4099,4098,4609,4100"; //自定义回放功能底部工具条按钮
this.oWebControl this.oWebControl
.JS_RequestInterface({ .JS_RequestInterface({
//通用请求响应接口 //通用请求响应接口
@ -222,7 +221,8 @@ export default {
encryptedFields: encryptedFields, //加密字段 encryptedFields: encryptedFields, //加密字段
showToolbar: showToolbar, //是否显示工具栏 showToolbar: showToolbar, //是否显示工具栏
showSmart: showSmart, //是否显示智能信息 showSmart: showSmart, //是否显示智能信息
buttonIDs: buttonIDs //自定义工具条按钮 buttonIDs: buttonIDs, //自定义工具条按钮
toolBarButtonIDs: toolBarButtonIDs //自定义回放功能工具条按钮
}) })
}) })
.then(oData => { .then(oData => {
@ -327,7 +327,6 @@ export default {
//录像回放功能 //录像回放功能
startPlayback(){ startPlayback(){
console.log('点击查看',this.locationValue)
console.log('编号',this.pointCode) console.log('编号',this.pointCode)
console.log('开始时间', this.startTime ) console.log('开始时间', this.startTime )
console.log('开始时间', new Date(this.startTime).getTime() / 1000 ) console.log('开始时间', new Date(this.startTime).getTime() / 1000 )
@ -335,7 +334,7 @@ export default {
var cameraIndexCode = this.pointCode; //获取输入的监控点编号值，必填 var cameraIndexCode = this.pointCode; //获取输入的监控点编号值，必填
var startTimeStamp = new Date(this.startTime).getTime(); //回放开始时间戳，必填 var startTimeStamp = new Date(this.startTime).getTime(); //回放开始时间戳，必填
var endTimeStamp = new Date(this.endTime).getTime(); //回放结束时间戳，必填 var endTimeStamp = new Date(this.endTime).getTime(); //回放结束时间戳，必填
var recordLocation = +this.locationValue; //录像存储位置：0-中心存储，1-设备存储 var recordLocation = 1; //录像存储位置：0-中心存储，1-设备存储
var transMode = 1; //传输协议：0-UDP，1-TCP var transMode = 1; //传输协议：0-UDP，1-TCP
var gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用 var gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用
var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口） var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口）
@ -388,7 +387,6 @@ export default {
//关闭视频窗口 //关闭视频窗口
closeWindow() { closeWindow() {
if (this.oWebControl != null) {
this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
this.oWebControl.JS_Disconnect().then( this.oWebControl.JS_Disconnect().then(
() => { () => {
@ -400,7 +398,6 @@ export default {
); );
} }
} }
}
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>