From 08156379e5019b00f9656670a230c4908b148fc1 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Fri, 12 Jun 2026 14:26:20 +0800 Subject: [PATCH] gengxin --- src/pathInfo.json | 1 - src/view/largeScreen2/index.vue | 508 +++++++++++++++++--------------- 2 files changed, 274 insertions(+), 235 deletions(-) diff --git a/src/pathInfo.json b/src/pathInfo.json index da7147e..afc697c 100644 --- a/src/pathInfo.json +++ b/src/pathInfo.json @@ -48,7 +48,6 @@ "/src/view/layout/setting/modules/layout/index.vue": "LayoutSettings", "/src/view/layout/tabs/index.vue": "HistoryComponent", "/src/view/login/index.vue": "Login", - "/src/view/masterStation/equipment/components/detail/components/alarm/index.vue": "Index", "/src/view/masterStation/equipment/components/detail/components/config/index.vue": "Index", "/src/view/masterStation/equipment/components/detail/components/info/index.vue": "Index", "/src/view/masterStation/equipment/components/detail/components/line/index.vue": "Index", diff --git a/src/view/largeScreen2/index.vue b/src/view/largeScreen2/index.vue index 5159d2a..aac9235 100644 --- a/src/view/largeScreen2/index.vue +++ b/src/view/largeScreen2/index.vue @@ -145,7 +145,7 @@
{{ row.gatewayAddress }}{{ row.gatewayAddress }} + >{{ row.gatewayAddress }}
@@ -290,21 +290,6 @@ return type === 'device_online' ? 'status-online' : 'status-offline' } - const setRem = () => { - const designWidth = 1920 - const designHeight = 1080 - const baseFontSize = 100 - const clientWidth = document.documentElement.clientWidth || document.body.clientWidth - const clientHeight = document.documentElement.clientHeight || document.body.clientHeight - - const scaleWidth = clientWidth / designWidth - const scaleHeight = clientHeight / designHeight - const scale = Math.min(scaleWidth, scaleHeight) - - const fontSize = scale * baseFontSize - document.documentElement.style.fontSize = fontSize + 'px' - } - const calculateTableHeight = () => { nextTick(() => { console.log('bottomRef.value', bottomRef.value.offsetHeight) @@ -315,9 +300,6 @@ } onMounted(() => { - setRem() - window.addEventListener('resize', setRem) - // if (bottomRef.value) { // resizeObserver = new ResizeObserver((entries) => { // for (const entry of entries) { @@ -513,11 +495,9 @@ } onBeforeUnmount(() => { - window.removeEventListener('resize', setRem) if (resizeObserver) { resizeObserver.disconnect() } - document.documentElement.style.fontSize = '' })