From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/desktop/index/store/modules/desktop.js | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 3922f55..5a91ef7 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -97,47 +97,53 @@
//璇诲彇褰撳墠灞忓箷鍒嗚鲸鐜�
console.log(window.screen.availWidth);
console.log(window.screen.availHeight);
-
- debugger;
+ 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'){
+ 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;
+ 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;
-
+ 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;
- 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--){
- let temp = state.frames.find(frame=>frame.id == state.minDocks[i].id);
- if(temp.isShow){
+ 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;
}
@@ -151,9 +157,9 @@
// }
// return false;
// });
-
+
state.minDocks.push(dock);
-
+
},
addMessageNotice: (state, msg) => {
let ids = state.messageNotices.map(item => item.id);
@@ -183,6 +189,7 @@
}
return false;
});
+
state.docks.find(function (it) {
if (it.id === item.id) {
it.isOpen = false;
@@ -194,32 +201,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){
-
+ state.minDocks.forEach((min, index) => {
+
+ if (min.id == it.id) {
+
min.highlight = true;
- }else{
+ } else {
min.highlight = false;
-
+
}
})
} else {
it.order = 0;
}
});
-
+
},
refreshTime: (state) => {
state.currentDate = new Date();
@@ -228,13 +246,13 @@
state.frames.find(function (it) {
if (it.id === id) {
it.isShow = true;
-
+
return true;
}
return false;
});
-
-
+
+
},
removeMessageById: (state, id) => {
state.messageNotices.find(function (item, idx) {
--
Gitblit v1.8.0