From d969c4735bfa4cfc21dda697c56cfae542a43017 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 11 八月 2020 19:52:22 +0800
Subject: [PATCH] 根据当前用户屏幕分辨率动态展示相关应用窗口的宽高
---
src/pages/desktop/index/store/modules/desktop.js | 17 ++++++++++++++++-
src/pages/desktop/index/components/DFrame.vue | 2 +-
src/pages/syslog/index/App.vue | 2 +-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index fe7257e..7dcebb3 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -112,7 +112,7 @@
//logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
imageTimeout: 0,
- useCORS: true //寮�鍚法鍩熼厤缃�
+ //useCORS: true //寮�鍚法鍩熼厤缃�
}).then(canvas => {
let shotSrc = canvas.toDataURL();
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index 3016c49..3922f55 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -94,8 +94,23 @@
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);
+
+ debugger;
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;
+ dframe.width = dframe.height*ratio;
+ }
+ }
//鍏ㄩ儴缁濆灞呬腑
dframe.leftOffset = (document.body.offsetWidth - dframe.width)/2;
dframe.topOffset = (document.body.offsetHeight - dframe.height)/2;
@@ -106,8 +121,8 @@
return true;
},
+
addMinDock: (state, dock) => {
-
let ids = state.minDocks.map(item => item.id);
if (ids.indexOf(dock.id) > -1) {
diff --git a/src/pages/syslog/index/App.vue b/src/pages/syslog/index/App.vue
index 2b2d37e..ac5ed2f 100644
--- a/src/pages/syslog/index/App.vue
+++ b/src/pages/syslog/index/App.vue
@@ -10,7 +10,7 @@
:value="item.value"
></el-option>
</el-select>
- <b>鏃堕棿:</b>
+ <b>鎿嶄綔鏃堕棿:</b>
<el-date-picker
v-model="timeValue"
type="datetimerange"
--
Gitblit v1.8.0