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 | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 72ecaa8..ed18975 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -89,26 +89,67 @@
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);
+
+ debugger;
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 > 140){
+ dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height;
+ 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;
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) {
//宸茬粡鍦╩indock閲�
let curFrame = state.frames.find(frame => frame.id == dock.id);
curFrame.isShow = false;
+ 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;
+ 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;
+ }
+ }
return;
}
// state.frames.find(function (it) {
@@ -118,7 +159,7 @@
// }
// return false;
// });
- debugger
+
state.minDocks.push(dock);
},
@@ -136,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);
@@ -150,6 +192,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -161,23 +204,36 @@
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=>{
+ state.minDocks.forEach((min,index)=>{
+
if(min.id == it.id){
- debugger
+
min.highlight = true;
}else{
min.highlight = false;
+
}
})
} else {
@@ -193,17 +249,12 @@
state.frames.find(function (it) {
if (it.id === id) {
it.isShow = true;
+
return true;
}
return false;
});
- // state.minDocks.find(function (it, idx) {
- // if (it.id === id) {
- // state.minDocks.splice(idx, 1);
- // return true;
- // }
- // return false;
- // });
+
},
removeMessageById: (state, id) => {
--
Gitblit v1.8.0