- +

- + + + + + + + \ No newline at end of file diff --git a/config/prod.env.js b/config/prod.env.js index 60248d8..f2501d0 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://192.168.8.210:8095/iris"' + BASE_API: '"http://192.168.5.220:20311"' } diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index f68473e..9e8e2ef 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -128,7 +128,6 @@

- diff --git a/src/views/video/history.vue b/src/views/video/history.vue index 1fc8fff..d3dd472 100644 --- a/src/views/video/history.vue +++ b/src/views/video/history.vue @@ -56,7 +56,7 @@ activeName: 'hk', videoShow: true, listQuery: { - code: '', + activeIp: '', startTime: '', endTime: '' }, @@ -97,16 +97,18 @@ window.frames['playNVR'].search(0, this.listQuery.startTime, this.listQuery.endTime) } else if (this.activeName === 'hk') { window.frames['playHK'].stop() - window.frames['playHK'].search(this.listQuery.code, this.listQuery.startTime, this.listQuery.endTime) + window.frames['playHK'].search(this.listQuery.activeIp, this.listQuery.startTime, this.listQuery.endTime) } } }) }, handleCameraClicked(camera) { console.log(camera) - if (typeof camera.ip === 'undefined' || camera.ip === '') { + if (typeof camera.monitorPoint === 'undefined' || camera.monitorPoint === '') { console.log('ip is null') return false + } else { + this.listQuery.activeIp = camera.monitorPoint } if (typeof camera.username === 'undefined' || camera.username === '') { console.log('username is null') diff --git a/src/views/video/monitor.vue b/src/views/video/monitor.vue index 3c74f71..df45267 100644 --- a/src/views/video/monitor.vue +++ b/src/views/video/monitor.vue @@ -4,12 +4,11 @@

- +

- + + + + + + + \ No newline at end of file diff --git a/static/webCtrl/hk/demo_window_simple_playback.html b/static/webCtrl/hk/demo_window_simple_playback.html index 4cbfe49..0f583aa 100644 --- a/static/webCtrl/hk/demo_window_simple_playback.html +++ b/static/webCtrl/hk/demo_window_simple_playback.html @@ -137,10 +137,10 @@ getPubKey(function () { ////////////////////////////////// 请自行修改以下变量值 //////////////////////////////////// - var appkey = "28730366"; //综合安防管理平台提供的appkey，必填 - var secret = setEncrypt("HSZkCJpSJ7gSUYrO6wVi"); //综合安防管理平台提供的secret，必填 - var ip = "10.19.132.75"; //综合安防管理平台IP地址，必填 - var playMode = 1; //初始播放模式：0-预览，1-回放 + var appkey = "25766251"; //综合安防管理平台提供的appkey，必填 + var secret = setEncrypt("h2o6zXtzCmt8eaOaMkXb"); //综合安防管理平台提供的secret，必填 + var ip = "192.168.1.22"; + var playMode = 1; //初始播放模式：0-预览，1-回放 var port = 443; //综合安防管理平台端口，若启用HTTPS协议，默认443 var snapDir = "D:\\SnapDir"; //抓图存储路径 var videoDir = "D:\\VideoDir"; //紧急录像或录像剪辑存储路径 diff --git a/static/webCtrl/hk/demo_window_simple_preview.html b/static/webCtrl/hk/demo_window_simple_preview.html index 9fb30e9..4a06f39 100644 --- a/static/webCtrl/hk/demo_window_simple_preview.html +++ b/static/webCtrl/hk/demo_window_simple_preview.html @@ -10,10 +10,10 @@ margin: 0; } .playWnd { - margin: 10px 0 0 10px; - width: 960px; /*播放容器的宽和高设定*/ - height: 570px; - border: 1px solid red; + margin: 10px 0 0 20px; + width: 1px; /*播放容器的宽和高设定*/ + height: 1px; + border: 1px solid white; } .operate { margin-top: 24px; @@ -83,48 +83,55 @@ //声明公用变量 var initCount = 0; var pubKey = ''; + var height = 700; + var width = 420; // 创建播放实例 function initPlugin () { - oWebControl = new WebControl({ - szPluginContainer: "playWnd", // 指定容器id - iServicePortStart: 15900, // 指定起止端口号，建议使用该值 - iServicePortEnd: 15909, - szClassId:"23BF3B0A-2C56-4D97-9C03-0CB103AA8F11", // 用于IE10使用ActiveX的clsid - cbConnectSuccess: function () { // 创建WebControl实例成功 - oWebControl.JS_StartService("window", { // WebControl实例创建成功后需要启动服务 - dllPath: "./VideoPluginConnect.dll" // 值"./VideoPluginConnect.dll"写死 - }).then(function () { // 启动插件服务成功 - oWebControl.JS_SetWindowControlCallback({ // 设置消息回调 - cbIntegrationCallBack: cbIntegrationCallBack - }); + oWebControl = new WebControl({ + szPluginContainer: "playWnd", // 指定容器id + iServicePortStart: 15900, // 指定起止端口号，建议使用该值 + iServicePortEnd: 15909, + szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11", // 用于IE10使用ActiveX的clsid + cbConnectSuccess: function() { // 创建WebControl实例成功 + oWebControl.JS_StartService("window", { // WebControl实例创建成功后需要启动服务 + dllPath: "./VideoPluginConnect.dll" // 值"./VideoPluginConnect.dll"写死 + }).then(function() { // 启动插件服务成功 + oWebControl.JS_SetWindowControlCallback({ // 设置消息回调 + cbIntegrationCallBack: cbIntegrationCallBack + }); - oWebControl.JS_CreateWnd("playWnd", 1000, 600).then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定 - init(); // 创建播放实例成功后初始化 - }); - }, function () { // 启动插件服务失败 - }); - }, - cbConnectError: function () { // 创建WebControl实例失败 - oWebControl = null; - $("#playWnd").html("插件未启动，正在尝试启动，请稍候..."); - WebControl.JS_WakeUp("VideoWebPlugin://"); // 程序未启动时执行error函数，采用wakeup来启动程序 - initCount ++; - if (initCount < 3) { - setTimeout(function () { - initPlugin(); - }, 3000) - } else { - $("#playWnd").html("插件启动失败，请检查插件是否安装！"); - } - }, - cbConnectClose: function (bNormalClose) { - // 异常断开：bNormalClose = false - // JS_Disconnect正常断开：bNormalClose = true - console.log("cbConnectClose"); - oWebControl = null; - } - }); + oWebControl.JS_CreateWnd("playWnd", height, width).then(function() { //JS_CreateWnd创建视频播放窗口，宽高可设定 + init(); // 创建播放实例成功后初始化 + }); + }, function() { // 启动插件服务失败 + }); + }, + cbConnectError: function() { // 创建WebControl实例失败 + oWebControl = null; + $("#playWnd").html("插件未启动，正在尝试启动，请稍候..."); + WebControl.JS_WakeUp("VideoWebPlugin://"); // 程序未启动时执行error函数，采用wakeup来启动程序 + initCount++; + if (initCount < 3) { + setTimeout(function() { + initPlugin(); + }, 3000) + } else { + $("#playWnd").html("插件启动失败，请检查插件是否安装！"); + } + }, + cbConnectClose: function(bNormalClose) { + // 异常断开：bNormalClose = false + // JS_Disconnect正常断开：bNormalClose = true + console.log("cbConnectClose"); + oWebControl = null; + } + }); + oWebControl.JS_SetDocOffset({ + left: 520, + top: 200 + }); + setWndCover(); } // 设置窗口控制回调 @@ -145,9 +152,9 @@ getPubKey(function () { ////////////////////////////////// 请自行修改以下变量值 //////////////////////////////////// - var appkey = "28730366"; //综合安防管理平台提供的appkey，必填 - var secret = setEncrypt("HSZkCJpSJ7gSUYrO6wVi"); //综合安防管理平台提供的secret，必填 - var ip = "10.19.132.75"; //综合安防管理平台IP地址，必填 + var appkey = "25766251"; //综合安防管理平台提供的appkey，必填 + var secret = setEncrypt("h2o6zXtzCmt8eaOaMkXb"); //综合安防管理平台提供的secret，必填 + var ip = "192.168.1.22"; //综合安防管理平台IP地址，必填 var playMode = 0; //初始播放模式：0-预览，1-回放 var port = 443; //综合安防管理平台端口，若启用HTTPS协议，默认443 var snapDir = "D:\\SnapDir"; //抓图存储路径 @@ -178,7 +185,7 @@ buttonIDs: buttonIDs //自定义工具条按钮 }) }).then(function (oData) { - oWebControl.JS_Resize(1000, 600); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题 + oWebControl.JS_Resize(height, width); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题 }); }); } @@ -209,15 +216,25 @@ // 监听resize事件，使插件窗口尺寸跟随DIV窗口变化 $(window).resize(function () { if (oWebControl != null) { - oWebControl.JS_Resize(1000, 600); + oWebControl.JS_Resize(height, width); setWndCover(); } }); + function reposition(left, top){ + if (oWebControl) { + oWebControl.JS_SetDocOffset({ + left: left, + top: top + }); + setWndCover(); + } + }; + // 监听滚动条scroll事件，使插件窗口跟随浏览器滚动而移动 $(window).scroll(function () { if (oWebControl != null) { - oWebControl.JS_Resize(1000, 600); + oWebControl.JS_Resize(height, width); setWndCover(); } }); @@ -234,23 +251,23 @@ var iCoverRight = (oDivRect.right - iWidth > 0) ? Math.round(oDivRect.right - iWidth) : 0; var iCoverBottom = (oDivRect.bottom - iHeight > 0) ? Math.round(oDivRect.bottom - iHeight) : 0; - iCoverLeft = (iCoverLeft > 1000) ? 1000 : iCoverLeft; - iCoverTop = (iCoverTop > 600) ? 600 : iCoverTop; - iCoverRight = (iCoverRight > 1000) ? 1000 : iCoverRight; - iCoverBottom = (iCoverBottom > 600) ? 600 : iCoverBottom; + iCoverLeft = (iCoverLeft > height) ? height : iCoverLeft; + iCoverTop = (iCoverTop > width) ? width : iCoverTop; + iCoverRight = (iCoverRight > height) ? height : iCoverRight; + iCoverBottom = (iCoverBottom > width) ? width : iCoverBottom; - oWebControl.JS_RepairPartWindow(0, 0, 1001, 600); // 多1个像素点防止还原后边界缺失一个像素条 + oWebControl.JS_RepairPartWindow(0, 0, height+1, width); // 多1个像素点防止还原后边界缺失一个像素条 if (iCoverLeft != 0) { - oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, 600); + oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, width); } if (iCoverTop != 0) { - oWebControl.JS_CuttingPartWindow(0, 0, 1001, iCoverTop); // 多剪掉一个像素条，防止出现剪掉一部分窗口后出现一个像素条 + oWebControl.JS_CuttingPartWindow(0, 0, height+1, iCoverTop); // 多剪掉一个像素条，防止出现剪掉一部分窗口后出现一个像素条 } if (iCoverRight != 0) { - oWebControl.JS_CuttingPartWindow(1000 - iCoverRight, 0, iCoverRight, 600); + oWebControl.JS_CuttingPartWindow(height - iCoverRight, 0, iCoverRight, width); } if (iCoverBottom != 0) { - oWebControl.JS_CuttingPartWindow(0, 600 - iCoverBottom, 1000, iCoverBottom); + oWebControl.JS_CuttingPartWindow(0, width - iCoverBottom, height, iCoverBottom); } } @@ -260,25 +277,27 @@ preview(cameraIndexCode) }); function preview(cameraIndexCode){ + oWebControl.JS_HideWnd(); - var streamMode = 0; //主子码流标识：0-主码流，1-子码流 - var transMode = 1; //传输协议：0-UDP，1-TCP - var gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用 - var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口） + var streamMode = 0; //主子码流标识：0-主码流，1-子码流 + var transMode = 1; //传输协议：0-UDP，1-TCP + var gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用 + var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口） - cameraIndexCode = cameraIndexCode.replace(/(^\s*)/g, ""); - cameraIndexCode = cameraIndexCode.replace(/(\s*$)/g, ""); + cameraIndexCode = cameraIndexCode.replace(/(^\s*)/g, ""); + cameraIndexCode = cameraIndexCode.replace(/(\s*$)/g, ""); - oWebControl.JS_RequestInterface({ - funcName: "startPreview", - argument: JSON.stringify({ - cameraIndexCode:cameraIndexCode, //监控点编号 - streamMode: streamMode, //主子码流标识 - transMode: transMode, //传输协议 - gpuMode: gpuMode, //是否开启GPU硬解 - wndId:wndId //可指定播放窗口 - }) - }) + oWebControl.JS_RequestInterface({ + funcName: "startPreview", + argument: JSON.stringify({ + cameraIndexCode: cameraIndexCode, //监控点编号 + streamMode: streamMode, //主子码流标识 + transMode: transMode, //传输协议 + gpuMode: gpuMode, + ezvizDirect: 0, + wndId:wndId //可指定播放窗口 + }) + }) }; //停止全部预览 $("#stopAllPreview").click(function () {