From 597ae9277ca3cadc34d6a395822f3d1720172c60 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Sun, 28 Sep 2025 09:16:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/components/MaterialDialog.vue | 2 +- .../devicesManage/deviesInfo/index.vue | 6 +++-- .../kitchen/environment/alarmRecord/index.vue | 6 ++--- .../environment/environmentMonitor/index.vue | 2 +- .../environment/videoMonitoring/history.vue | 12 ++++----- .../environment/videoMonitoring/index.vue | 27 ++++++++++--------- .../environment/videoMonitoring/temp.vue | 16 +++++------ 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue index 4a6ece1e..79212b24 100644 --- a/src/views/canteen/dish/material/components/MaterialDialog.vue +++ b/src/views/canteen/dish/material/components/MaterialDialog.vue @@ -127,7 +127,7 @@ - + - + @@ -296,6 +296,7 @@ export default { treeOptions:[], //区域 canteenOptions: [], subPlaceOptions: [], + deviceTypeName:"摄像头", // 弹出层标题 title: "", // 是否显示弹出层 @@ -307,7 +308,7 @@ export default { keyWord: undefined, deviceNetworkState: null }, - activeName:"1", + activeName:1, // 表单参数 form: {}, // 表单校验 @@ -398,6 +399,7 @@ export default { }, handleTabClick(tab, event) { console.log(tab.name,tab.label) + this.deviceTypeName = tab.label this.handleQuery() }, /** 查询列表 */ diff --git a/src/views/kitchen/environment/alarmRecord/index.vue b/src/views/kitchen/environment/alarmRecord/index.vue index b9f66dea..8c21c31c 100644 --- a/src/views/kitchen/environment/alarmRecord/index.vue +++ b/src/views/kitchen/environment/alarmRecord/index.vue @@ -14,10 +14,10 @@ - + - - + + diff --git a/src/views/kitchen/environment/environmentMonitor/index.vue b/src/views/kitchen/environment/environmentMonitor/index.vue index ffdedf0a..b712e0ad 100644 --- a/src/views/kitchen/environment/environmentMonitor/index.vue +++ b/src/views/kitchen/environment/environmentMonitor/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/kitchen/environment/videoMonitoring/history.vue b/src/views/kitchen/environment/videoMonitoring/history.vue index 0e743b3a..5ff50fe4 100644 --- a/src/views/kitchen/environment/videoMonitoring/history.vue +++ b/src/views/kitchen/environment/videoMonitoring/history.vue @@ -90,10 +90,10 @@ methods:{ iframeLogin(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -129,10 +129,10 @@ methods:{ iframeLogout(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -161,10 +161,10 @@ methods:{ iframeLoaded2(){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel diff --git a/src/views/kitchen/environment/videoMonitoring/index.vue b/src/views/kitchen/environment/videoMonitoring/index.vue index 7357431a..b22fbfa5 100644 --- a/src/views/kitchen/environment/videoMonitoring/index.vue +++ b/src/views/kitchen/environment/videoMonitoring/index.vue @@ -68,10 +68,10 @@ methods:{ iframeLogin(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -86,32 +86,33 @@ methods:{ oWebVideoCtrl1.I_InsertOBJECTPlugin("divPlugin"); oWebVideoCtrl1.I_Login(oLiveView.szIP,oLiveView.iProtocol, oLiveView.szPort, oLiveView.szUsername, oLiveView.szPassword, { success: function (xmlDoc) { + console.log("success",xmlDoc) oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { iRtspPort: oLiveView.szPort, iWndIndex:0, iStreamType: oLiveView.iStreamType, - iChannelID: 15, + iChannelID: 1, bZeroChannel: oLiveView.bZeroChannel }); oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { iRtspPort: oLiveView.szPort, iWndIndex:1, iStreamType: oLiveView.iStreamType, - iChannelID: 16, + iChannelID: 2, bZeroChannel: oLiveView.bZeroChannel }); oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { iRtspPort: oLiveView.szPort, iWndIndex:2, iStreamType: oLiveView.iStreamType, - iChannelID: 21, + iChannelID: 1, bZeroChannel: oLiveView.bZeroChannel }); oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { iRtspPort: oLiveView.szPort, iWndIndex:3, iStreamType: oLiveView.iStreamType, - iChannelID: 22, + iChannelID: 2, bZeroChannel: oLiveView.bZeroChannel }); } @@ -136,11 +137,11 @@ methods:{ iframeLogout(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password - iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream + szPassword: "JYY202509", // device password + iStreamType: 1, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel } @@ -169,10 +170,10 @@ methods:{ iframeLoaded(WinNo,Channel){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip - szPort: "80", // protocol port - szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szIP:"192.168.20.32", // protocol ip + szPort:"80", // protocol port + szUsername:"admin", // device username + szPassword:"JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel diff --git a/src/views/kitchen/environment/videoMonitoring/temp.vue b/src/views/kitchen/environment/videoMonitoring/temp.vue index f2fab0e6..259611ff 100644 --- a/src/views/kitchen/environment/videoMonitoring/temp.vue +++ b/src/views/kitchen/environment/videoMonitoring/temp.vue @@ -108,10 +108,10 @@ methods:{ iframeLogin(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -202,10 +202,10 @@ methods:{ iframeLogout(domId){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -260,10 +260,10 @@ methods:{ console.log(Channel) var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel @@ -297,10 +297,10 @@ methods:{ iframeLoaded2(Channel){ var oLiveView = { iProtocol: 1, // protocol 1��http, 2:https - szIP: "192.168.1.10", // protocol ip + szIP: "192.168.20.32", // protocol ip szPort: "80", // protocol port szUsername: "admin", // device username - szPassword: "hzx12345", // device password + szPassword: "JYY202509", // device password iStreamType: 2, // stream 1��main stream 2��sub-stream 3��third stream 4��transcode stream iChannelID: 1, // channel no bZeroChannel: false // zero channel