From 2b80ac249e42ed69b2f53eef73debd9d74103909 Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Mon, 22 Jul 2024 18:01:36 +0800
Subject: [PATCH] =?UTF-8?q?[FEAT]=201.=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=AB=98=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/screen/screen1/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/screen/screen1/index.vue b/src/pages/screen/screen1/index.vue
index 35f7b45..e7feb8a 100644
--- a/src/pages/screen/screen1/index.vue
+++ b/src/pages/screen/screen1/index.vue
@@ -13,7 +13,7 @@
                         borderRadius: '12px',
                         boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
                         width: (Platform.is.android ? '620px' : '100%'),
-                        height: (Platform.is.android ? (screenStore.CurrentAppFullscreen == true ? '980' : '930') : (Number(Screen.height) + 100)) + 'px'
+                        height: (Platform.is.android ? (screenStore.CurrentAppFullscreen == true ? '980' : '930') : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) - 63) : (Number(Screen.height) + 108))) + 'px'
                     }">
                     </div>
                     <!-- </div> -->
@@ -28,7 +28,7 @@
                                 borderRadius: '12px',
                                 boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
                                 width: (Platform.is.android ? '625px' : '100%'),
-                                height: (Platform.is.android ? '420' : (Number(Screen.height) / 2 + 50)) + 'px'
+                                height: (Platform.is.android ? '420' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px'
                             }"></div>
                         </div>
                         <!-- 月度OEE统计 -->
@@ -38,7 +38,7 @@
                                 borderRadius: '12px',
                                 boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
                                 width: (Platform.is.android ? '625px' : '100%'),
-                                height: (Platform.is.android ? '420' : (Number(Screen.height) / 2 + 50)) + 'px'
+                                height: (Platform.is.android ? '420' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px'
                             }"></div>
                         </div>
                         <!-- 月度开炉次数统计 -->
@@ -48,7 +48,7 @@
                                 borderRadius: '12px',
                                 boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
                                 width: (Platform.is.android ? '600px' : '100%'),
-                                height: (Platform.is.android ? '470' : (Number(Screen.height) / 2 + 50)) + 'px'
+                                height: (Platform.is.android ? '470' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px'
                             }">
                             </div>
                         </div>
@@ -62,7 +62,7 @@
                                 boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
                                 margin: '0px',
                                 width: (Platform.is.android ? '600px' : '100%'),
-                                height: (Platform.is.android ? '470' : (Number(Screen.height) / 2 + 50)) + 'px'
+                                height: (Platform.is.android ? '470' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px'
                             }">
                                 <!-- <div class="col-xl-12 col-lg-12 col-sm-12">
                                     <div :style="'width: 100%; height:' + (Number(Screen.height) / 2 - 100) + 'px'">