From 12484ddf51aa6dbc38728eb783dfbf00250691d8 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 20 Mar 2024 09:16:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../replayVideoManage/components/playBack/playBack.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue index 2828064b..8086667e 100644 --- a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue +++ b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue @@ -10,7 +10,6 @@ export default { data() { return { videoType:"", - locationValue:1, //声明公用变量 initCount: 0, //初始化参数 @@ -327,7 +326,6 @@ export default { //录像回放功能 startPlayback(){ - console.log('点击查看',this.locationValue) console.log('编号',this.pointCode) console.log('开始时间', this.startTime ) console.log('开始时间', new Date(this.startTime).getTime() / 1000 ) @@ -335,7 +333,7 @@ export default { var cameraIndexCode = this.pointCode; //获取输入的监控点编号值，必填 var startTimeStamp = new Date(this.startTime).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 gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用 var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口） From 7c83752125ebc8b38da74ac3c20eba353ac5e838 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 25 Mar 2024 19:11:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=B5=B7=E5=BA=B7=E6=8F=92=E4=BB=B6?= =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/components/videoModule/playBack/playBack.vue | 4 +--- .../replayVideoManage/components/playBack/playBack.vue | 9 ++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index fd882353..1b2b505a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 diff --git a/src/components/videoModule/playBack/playBack.vue b/src/components/videoModule/playBack/playBack.vue index 0fb9f2e6..1e7e71e8 100644 --- a/src/components/videoModule/playBack/playBack.vue +++ b/src/components/videoModule/playBack/playBack.vue @@ -405,8 +405,7 @@ export default { //关闭视频窗口 closeWindow() { - if (this.oWebControl != null) { - this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 + this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_Disconnect().then( () => { // 断开与插件服务连接成功 @@ -415,7 +414,6 @@ export default { // 断开与插件服务连接失败 } ); - } } } }; diff --git a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue index 8086667e..20f871c4 100644 --- a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue +++ b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue @@ -203,7 +203,7 @@ export default { var buttonIDs = "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 .JS_RequestInterface({ //通用请求响应接口 @@ -221,7 +221,8 @@ export default { encryptedFields: encryptedFields, //加密字段 showToolbar: showToolbar, //是否显示工具栏 showSmart: showSmart, //是否显示智能信息 - buttonIDs: buttonIDs //自定义工具条按钮 + buttonIDs: buttonIDs, //自定义工具条按钮 + toolBarButtonIDs: toolBarButtonIDs //自定义回放功能工具条按钮 }) }) .then(oData => { @@ -386,8 +387,7 @@ export default { //关闭视频窗口 closeWindow() { - if (this.oWebControl != null) { - this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 + this.oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_Disconnect().then( () => { // 断开与插件服务连接成功 @@ -396,7 +396,6 @@ export default { // 断开与插件服务连接失败 } ); - } } } }; From a8b35586e910e24569b8f73fbb999422d2c6b0c7 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 26 Mar 2024 16:29:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=BC=94=E7=A4=BA=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 10eac4b9..10ede28b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈