From 21a340c24815a55a07db2dc3d2e5a19e7de440cd Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 29 八月 2020 19:27:57 +0800
Subject: [PATCH] 添加摄像机区域管理应用
---
src/pages/desktop/index/store/modules/desktop.js | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 3922f55..98327d8 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -97,8 +97,7 @@
//璇诲彇褰撳墠灞忓箷鍒嗚鲸鐜�
console.log(window.screen.availWidth);
console.log(window.screen.availHeight);
-
- debugger;
+ dframe.name = curDframe.name;
dframe.width = curDframe.width;
dframe.height = curDframe.height;
//鏍规嵁鍒嗚鲸鐜囧姩鎬佽皟鏁�(鎽勫儚鏈洪厤缃�,鏁版嵁鏍堥厤缃�,姣斿搴撶鐞�,绠楀姏绠＄悊,瀹炴椂鐩戞帶)
@@ -106,8 +105,8 @@
let ratio = curDframe.width/curDframe.height;
if(curDframe.name == 'cameraAccess' || curDframe.name == 'dataStack' || curDframe.name == 'library' || curDframe.name == 'analysisPower' || curDframe.name == 'cameraVideo'){
//澶勭悊瀵屼綑楂樺害澶т簬140鐨勭獥鍙�
- if(window.screen.availHeight - curDframe.height > 140){
- dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height;
+ if(window.screen.availHeight - curDframe.height > 120){
+ dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height - 50;
dframe.width = dframe.height*ratio;
}
}
@@ -117,11 +116,19 @@
state.framesOrder = order;
state.framesOffset = offset;
+ debugger
state.frames.push(dframe);
return true;
},
-
+ shotscreen: (state, {id,src}) => {
+ let curFrame = state.frames.find(frame => frame.id == id);
+ if(!curFrame.isShow){
+ return
+ }
+ let curDock = state.minDocks.find(one => one.id == id);
+ curDock.screenshot = src;
+ },
addMinDock: (state, dock) => {
let ids = state.minDocks.map(item => item.id);
@@ -132,7 +139,8 @@
let minOne = state.minDocks.find(one => one.id == dock.id);
minOne.highlight = false;
- minOne.screenshot = dock.screenshot;
+ debugger
+ minOne.screenshot = dock.screenshot?dock.screenshot:minOne.screenshot;
//鎵惧埌minDocks鏈�杩戞墦寮�鐨勭姸鎬乮sShow涓簍rue鐨刣ock缃负楂樹寒
let minLen = state.minDocks.length;
for(var i = minLen-1; i >= 0; i--){
@@ -183,6 +191,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -194,6 +203,17 @@
state.safari.active = false;
}
},
+ highlight(state){
+ //鎵惧埌minDocks鏈�杩戞墦寮�鐨勭姸鎬乮sShow涓簍rue鐨刣ock缃负楂樹寒
+ let minLen = state.minDocks.length;
+ for(var i = minLen-1; i >= 0; i--){
+ let temp = state.frames.find(frame=>frame.id == state.minDocks[i].id);
+ if(temp.isShow){
+ state.minDocks[i].highlight = true;
+ return;
+ }
+ }
+ },
openSafari: (state) => {
state.safari.active = true;
state.safari.isShow = true;
--
Gitblit v1.8.0