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 | 123 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 6194ba1..6ab8f37 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -15,7 +15,7 @@
isShow: true,
url: '',
title: 'safari',
- icon: 'images/safari.png',
+ icon: '/images/desktop/safari.png',
order: 0,
leftOffset: 8,
topOffset: 8
@@ -25,7 +25,11 @@
};
// getters
-const getters = {};
+const getters = {
+ frames(state) {
+ return state.frames;
+ }
+};
// actions
const actions = {
@@ -73,7 +77,7 @@
addFrame: (state, dframe) => {
let ids = state.frames.map(item => item.id);
if (ids.indexOf(dframe.id) > -1) {
- return;
+ return false;
}
let order = state.framesOrder + 1;
@@ -85,33 +89,78 @@
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);
+ 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;
+
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) => {
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?dock.screenshot:minOne.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) {
- if (it.id === dock.id) {
- it.isShow = false;
- return true;
- }
- return false;
- });
+ // state.frames.find(function (it) {
+ // if (it.id === dock.id) {
+ // it.isShow = false;
+ // return true;
+ // }
+ // return false;
+ // });
+
state.minDocks.push(dock);
- if (dock.id === 'safari') {
- state.safari.isShow = false;
- }
+
},
addMessageNotice: (state, msg) => {
let ids = state.messageNotices.map(item => item.id);
@@ -141,6 +190,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -152,23 +202,43 @@
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) => {
+
state.frames.forEach(function (it) {
+
if (it.id === item.id) {
it.order = 1;
+
+ state.minDocks.forEach((min,index)=>{
+
+ if(min.id == it.id){
+
+ min.highlight = true;
+ }else{
+ min.highlight = false;
+
+ }
+ })
} else {
it.order = 0;
}
});
- if (item.id === 'safari') {
- state.safari.order = 1;
- } else {
- state.safari.order = 0;
- }
+
},
refreshTime: (state) => {
state.currentDate = new Date();
@@ -177,20 +247,13 @@
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;
- });
- if (id === 'safari') {
- state.safari.isShow = true;
- }
+
+
},
removeMessageById: (state, id) => {
state.messageNotices.find(function (item, idx) {
--
Gitblit v1.8.0