From 59ad7ba6452b2028fd7faca000c626a148256620 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 01 九月 2020 23:29:50 +0800
Subject: [PATCH] fix: do not allow empty data to be saved. for area manager
---
src/pages/desktop/index/store/modules/desktop.js | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index dd4abc1..75911bc 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;
}
}
@@ -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--){
@@ -177,7 +176,6 @@
state.notificationCenterVisible = visible;
},
closeFrame: (state, item) => {
-
state.frames.find(function (it, idx) {
if (it.id === item.id) {
state.frames.splice(idx, 1);
--
Gitblit v1.8.0