1.修复全屏导致高度计算错误问题
main
liuhr 2 years ago
parent e092204bee
commit 2b80ac249e

@ -13,7 +13,7 @@
borderRadius: '12px', borderRadius: '12px',
boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
width: (Platform.is.android ? '620px' : '100%'), 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>
<!-- </div> --> <!-- </div> -->
@ -28,7 +28,7 @@
borderRadius: '12px', borderRadius: '12px',
boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
width: (Platform.is.android ? '625px' : '100%'), 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>
</div> </div>
<!-- 月度OEE统计 --> <!-- 月度OEE统计 -->
@ -38,7 +38,7 @@
borderRadius: '12px', borderRadius: '12px',
boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
width: (Platform.is.android ? '625px' : '100%'), 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>
</div> </div>
<!-- 月度开炉次数统计 --> <!-- 月度开炉次数统计 -->
@ -48,7 +48,7 @@
borderRadius: '12px', borderRadius: '12px',
boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
width: (Platform.is.android ? '600px' : '100%'), 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>
</div> </div>
@ -62,7 +62,7 @@
boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f',
margin: '0px', margin: '0px',
width: (Platform.is.android ? '600px' : '100%'), 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 class="col-xl-12 col-lg-12 col-sm-12">
<div :style="'width: 100%; height:' + (Number(Screen.height) / 2 - 100) + 'px'"> <div :style="'width: 100%; height:' + (Number(Screen.height) / 2 - 100) + 'px'">

Loading…
Cancel
Save