From a5e8ef032f149ac7a3827169a8affa8ecd4cb4f9 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 19 八月 2020 18:06:51 +0800
Subject: [PATCH] 打开应用异步抓取快照去掉最小化快照,应用中心界面调整,初始应用窗口计算修改
---
src/pages/desktop/index/store/modules/desktop.js | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index ed18975..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,6 +116,7 @@
state.framesOrder = order;
state.framesOffset = offset;
+ debugger
state.frames.push(dframe);
return true;
@@ -140,7 +140,7 @@
minOne.highlight = false;
debugger
- minOne.screenshot = dock.screenshot;
+ 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--){
@@ -177,7 +177,6 @@
state.notificationCenterVisible = visible;
},
closeFrame: (state, item) => {
- debugger
state.frames.find(function (it, idx) {
if (it.id === item.id) {
state.frames.splice(idx, 1);
--
Gitblit v1.8.0