diff --git a/src/css/common.scss b/src/css/common.scss index 0ba5ab3..85a1136 100644 --- a/src/css/common.scss +++ b/src/css/common.scss @@ -5,7 +5,7 @@ body, padding: 0; width: 100%; height: 100%; - font-size: 14px; + font-size: 16px; overflow: hidden !important; font-family: Microsoft YaHei, Hiragino Sans GB; } diff --git a/src/views/screen/RealTimeUsed.vue b/src/views/screen/RealTimeUsed.vue index 6bea3e3..6384e50 100644 --- a/src/views/screen/RealTimeUsed.vue +++ b/src/views/screen/RealTimeUsed.vue @@ -20,7 +20,7 @@ export default { this.getRealTimeUesdView() this.timer = setInterval(() => { this.getRealTimeData() - }, 1000) + }, 10000) }, unmounted() { clearInterval(this.timer) diff --git a/src/views/screen/components/FullScreenContainer.vue b/src/views/screen/components/FullScreenContainer.vue index 6ed5650..a9f14f7 100644 --- a/src/views/screen/components/FullScreenContainer.vue +++ b/src/views/screen/components/FullScreenContainer.vue @@ -31,10 +31,13 @@ export default { scale: null }) const style = computed(() => { + // 标品: 始终保持1920*1080的宽高比 + // 改动后: 始终保持占满屏幕, 最宽1920 + const innerWidth = window.innerWidth > 1920 ? 1920 : window.innerWidth return { width: `${props.width}px`, height: `${props.height}px`, - transform: `scale(${state.scale})` + transform: `scale(${innerWidth / 1920},${state.scale})` } }) function getScale() { diff --git a/src/views/screen/components/ScrollTable/index.vue b/src/views/screen/components/ScrollTable/index.vue index 3a813cb..0e9e51a 100644 --- a/src/views/screen/components/ScrollTable/index.vue +++ b/src/views/screen/components/ScrollTable/index.vue @@ -48,10 +48,11 @@ export default {