From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001 From: hanbaoshan <hanbaoshan@aiotlink.com> Date: 星期六, 15 八月 2020 19:10:03 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai --- src/pages/desktop/index/store/modules/desktop.js | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js index 3922f55..ed18975 100644 --- a/src/pages/desktop/index/store/modules/desktop.js +++ b/src/pages/desktop/index/store/modules/desktop.js @@ -121,7 +121,14 @@ 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,6 +139,7 @@ let minOne = state.minDocks.find(one => one.id == dock.id); minOne.highlight = false; + debugger minOne.screenshot = dock.screenshot; //鎵惧埌minDocks鏈�杩戞墦寮�鐨勭姸鎬乮sShow涓簍rue鐨刣ock缃负楂樹寒 let minLen = state.minDocks.length; @@ -169,6 +177,7 @@ state.notificationCenterVisible = visible; }, closeFrame: (state, item) => { + debugger state.frames.find(function (it, idx) { if (it.id === item.id) { state.frames.splice(idx, 1); @@ -183,6 +192,7 @@ } return false; }); + state.docks.find(function (it) { if (it.id === item.id) { it.isOpen = false; @@ -194,6 +204,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