From dbbbe5829b9eb975042df42a5bad330312d263a4 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 10 Jul 2025 10:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../environment/videoMonitoring/history.vue   | 22 +++++++++----------
 .../environment/videoMonitoring/index.vue     | 21 +++++++++---------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/views/kitchen/environment/videoMonitoring/history.vue b/src/views/kitchen/environment/videoMonitoring/history.vue
index 0dd088cd..7d6b9c3d 100644
--- a/src/views/kitchen/environment/videoMonitoring/history.vue
+++ b/src/views/kitchen/environment/videoMonitoring/history.vue
@@ -111,13 +111,13 @@ methods:{
                         success: function (xmlDoc) {  
                             // console.log(that.formatDateTime(that.dateRange[0]))
                             // console.log(that.formatDateTime(that.dateRange[1]))
-                            oWebVideoCtrl2.I_StartPlayback(szDeviceIdentify, {
-                                szStartTime:that.formatDateTime(that.dateRange[0]),
-                                szEndTime:that.formatDateTime(that.dateRange[1]),
-                                iChannelID: that.chosenChannel2,
-                                iStreamType: oLiveView.iStreamType, 
-                                bZeroChannel: oLiveView.bZeroChannel
-                            });   
+                            // oWebVideoCtrl2.I_StartPlayback(szDeviceIdentify, {
+                            //     szStartTime:that.formatDateTime(that.dateRange[0]),
+                            //     szEndTime:that.formatDateTime(that.dateRange[1]),
+                            //     iChannelID: that.chosenChannel2,
+                            //     iStreamType: oLiveView.iStreamType, 
+                            //     bZeroChannel: oLiveView.bZeroChannel
+                            // });   
                         }
                     }); 
                 }
@@ -157,7 +157,7 @@ methods:{
             this.$modal.msgError("设备未绑定通道号");
         } 
     },
-    iframeLoaded2(Channel){   
+    iframeLoaded2(){   
         var oLiveView = {
             iProtocol: 1,            // protocol 1��http, 2:https
             szIP: "192.168.1.10",    // protocol ip
@@ -168,7 +168,7 @@ methods:{
             iChannelID: 1,           // channel no
             bZeroChannel: false      // zero channel
         }
-        var szDeviceIdentify = oLiveView.szIP; 
+        var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;   
         var oWebVideoCtrl2 = this.$refs.videoIframe2.contentWindow.WebVideoCtrl; 
         var that = this;
         oWebVideoCtrl2.I_Stop({iWndIndex:0}) 
@@ -186,9 +186,9 @@ methods:{
     }, 
     defaultDateRange() {
         const end = new Date(new Date().toLocaleDateString());
-        end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+        end.setTime(end.getTime() + 10 * 60 * 60 * 1000);
         const start = new Date((new Date().toLocaleDateString()));
-        start.setTime(start.getTime()+ 9 * 60 * 60 * 1000 - 1); 
+        start.setTime(start.getTime()+ 8 * 60 * 60 * 1000); 
         this.start = parseInt(start.getTime() / 1000)
         this.end = parseInt(end.getTime() / 1000)
         return [start, end]
diff --git a/src/views/kitchen/environment/videoMonitoring/index.vue b/src/views/kitchen/environment/videoMonitoring/index.vue
index 324ea89c..439dfa61 100644
--- a/src/views/kitchen/environment/videoMonitoring/index.vue
+++ b/src/views/kitchen/environment/videoMonitoring/index.vue
@@ -122,16 +122,15 @@ methods:{
                 var szInfo = "当前选择的窗口编号：" + WndIndex;
                 console.log(szInfo)
                 that.chosenWinNo = WndIndex;  
-            },
-            cbDoubleClickWnd: function (iWndIndex, bFullScreen) {
-                console.log(1111222) 
-                var szInfo = "当前放大的窗口编号：" + iWndIndex;
-                if (!bFullScreen) {            
-                    szInfo = "当前还原的窗口编号：" + iWndIndex;
-                }
-                console.log(szInfo) 
-            } 
-             //WebVideoCtrl.I_FullScreen(true);isFullScreen
+            }
+            // cbDoubleClickWnd: function (iWndIndex, bFullScreen) {
+            //     oWebVideoCtrl1.I_FullScreen(iWndIndex,true); 
+            //     var szInfo = "当前放大的窗口编号：" + iWndIndex;
+            //     if (!bFullScreen) {            
+            //         szInfo = "当前还原的窗口编号：" + iWndIndex;
+            //     }
+            //     console.log(szInfo)  
+            // }
         });  
     },
     iframeLogout(domId){
@@ -161,7 +160,7 @@ methods:{
     async handleNodeClick(data) { 
         if(data.deviceExtendInfo&&data.deviceExtendInfo!=""){
             let obj = JSON.parse(data.deviceExtendInfo)  
-            this.chosenChannel = 15 
+            this.chosenChannel = 18;
             this.iframeLoaded(this.chosenWinNo,this.chosenChannel)  
         }else{
             this.$modal.msgError("设备未绑定通道号");