From 98a6297b10a4b97c3022f84d3ba7908c178d9ee0 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 20 十月 2020 10:30:10 +0800
Subject: [PATCH] 应用中心安装提示bug修复
---
src/pages/desktop/index/store/modules/desktop.js | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index cfb3747..6ab8f37 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;
//鏍规嵁鍒嗚鲸鐜囧姩鎬佽皟鏁�(鎽勫儚鏈洪厤缃�,鏁版嵁鏍堥厤缃�,姣斿搴撶鐞�,绠楀姏绠＄悊,瀹炴椂鐩戞帶)
@@ -107,7 +106,7 @@
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.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height - 50;
dframe.width = dframe.height*ratio;
}
}
@@ -140,7 +139,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--){
@@ -191,6 +190,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -202,6 +202,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