From 28c0c2dcec08b4932a4fc5bfd6bcf0dc036edb23 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 23 十月 2020 20:15:01 +0800
Subject: [PATCH] 应用中心-算法软件实时显示安装/升级进度
---
src/pages/desktop/index/store/modules/desktop.js | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 3016c49..6ab8f37 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -94,8 +94,22 @@
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 > 140){
+ 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;
@@ -106,8 +120,15 @@
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);
if (ids.indexOf(dock.id) > -1) {
@@ -117,7 +138,8 @@
let minOne = state.minDocks.find(one => one.id == dock.id);
minOne.highlight = false;
- minOne.screenshot = dock.screenshot;
+ 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--){
@@ -168,6 +190,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -179,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