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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js index a86b69f..98327d8 100644 --- a/src/pages/desktop/index/store/modules/desktop.js +++ b/src/pages/desktop/index/store/modules/desktop.js @@ -89,21 +89,47 @@ offset = 5; } } - dframe.leftOffset = state.framesOffset + order; - dframe.topOffset = state.framesOffset + order; + // dframe.leftOffset = state.framesOffset + order; + // dframe.topOffset = state.framesOffset + order; dframe.order = 0; dframe.isShow = true; let curDframe = state.docks.find(dock => dock.id == dframe.id); + //璇诲彇褰撳墠灞忓箷鍒嗚鲸鐜� + console.log(window.screen.availWidth); + console.log(window.screen.availHeight); + dframe.name = curDframe.name; dframe.width = curDframe.width; dframe.height = curDframe.height; + //鏍规嵁鍒嗚鲸鐜囧姩鎬佽皟鏁�(鎽勫儚鏈洪厤缃�,鏁版嵁鏍堥厤缃�,姣斿搴撶鐞�,绠楀姏绠$悊,瀹炴椂鐩戞帶) + //鑾峰彇鍘熷瀹介珮姣� + 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 > 120){ + dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height - 50; + dframe.width = dframe.height*ratio; + } + } + //鍏ㄩ儴缁濆灞呬腑 + dframe.leftOffset = (document.body.offsetWidth - dframe.width)/2; + dframe.topOffset = (document.body.offsetHeight - dframe.height)/2; + 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) => { - debugger let ids = state.minDocks.map(item => item.id); if (ids.indexOf(dock.id) > -1) { @@ -113,10 +139,11 @@ let minOne = state.minDocks.find(one => one.id == dock.id); minOne.highlight = false; + 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--){ - debugger let temp = state.frames.find(frame=>frame.id == state.minDocks[i].id); if(temp.isShow){ state.minDocks[i].highlight = true; @@ -132,7 +159,7 @@ // } // return false; // }); - debugger + state.minDocks.push(dock); }, @@ -164,6 +191,7 @@ } return false; }); + state.docks.find(function (it) { if (it.id === item.id) { it.isOpen = false; @@ -175,21 +203,32 @@ 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; }, refreshFrame: (state, item) => { - debugger + state.frames.forEach(function (it) { - debugger + if (it.id === item.id) { it.order = 1; state.minDocks.forEach((min,index)=>{ - debugger + if(min.id == it.id){ - debugger + min.highlight = true; }else{ min.highlight = false; -- Gitblit v1.8.0