From 2b8c4d7b50593df37c1ec28b47a216932dd2fb04 Mon Sep 17 00:00:00 2001 From: LiLongLong <13717757313@163.com> Date: Sat, 14 Jun 2025 17:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=E5=8F=8A?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.vue | 28 +++++------ src/assets/styles/common.scss | 2 +- src/assets/styles/element.scss | 3 +- .../common/CascadingSelectModal/index.vue | 41 ++++++++++++++-- src/components/common/SelectModal/index.vue | 31 ++++++++++-- src/components/formula/FormulaConfig.vue | 17 ++++--- src/components/formula/FormulaTable.vue | 2 +- src/components/home/Environment.vue | 8 +--- src/components/home/HomeLogLevel.vue | 3 +- src/components/home/HomeOperation.vue | 2 +- src/components/home/HomeSetting.vue | 37 +++++++++++---- src/components/seal/DashboardChart.vue | 4 +- src/components/setting/Device.vue | 5 ++ src/components/setting/SystemDate.vue | 2 +- src/components/system/NetReconnection.vue | 7 ++- src/layouts/default.vue | 4 +- src/libs/constant.ts | 14 +++--- src/libs/socket.ts | 13 ++--- src/stores/formulaStore.ts | 4 +- src/stores/homeStore.ts | 24 +++++++--- src/views/audit/index.vue | 20 ++++---- src/views/debug/index.vue | 55 +++++++++++----------- src/views/login/index.vue | 1 + src/views/seal/index.vue | 26 ++++++---- src/views/setting/index.vue | 27 ++++++++++- 25 files changed, 250 insertions(+), 130 deletions(-) diff --git a/src/app.vue b/src/app.vue index dbc2004..6cbe7bb 100644 --- a/src/app.vue +++ b/src/app.vue @@ -29,9 +29,9 @@ let timer: any = null // 进度条定时器 onBeforeMount(async () => { startProgress() // 启动进度条 // 环境数据轮询(每2秒获取一次) - // setInterval(async () => { - // await readH2o2Data() - // }, 3000) + setInterval(async () => { + await readH2o2Data() + }, 3000) }) /** @@ -84,17 +84,17 @@ const startProgress = () => { * @function 读取过氧化氢传感器数据 * @desc 轮询获取环境传感器数据并更新到主页状态 */ -// const readH2o2Data = async () => { -// const envParams = { -// fnName: 'readH2O2SensorData', -// className: 'FrontEndRealtimeDisplayContentMgr', -// params: {}, -// } -// const resData = await sendCmd(envParams) -// if (resData.val.length) { -// homeStore.updateHomeData(resData.val) -// } -// } +const readH2o2Data = async () => { + const envParams = { + fnName: 'readH2O2SensorData', + className: 'FrontEndRealtimeDisplayContentMgr', + params: {}, + } + await sendCmd(envParams) + // if (resData.val.length) { + // homeStore.updateHomeData(resData.val) + // } +} /** * @function 初始化核心数据 diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss index 30cff0f..d5fa3df 100644 --- a/src/assets/styles/common.scss +++ b/src/assets/styles/common.scss @@ -1,6 +1,6 @@ /* CSS Document */ html { - font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif; + font-family: serif !important; height: 100vh; font-size: 14px; } diff --git a/src/assets/styles/element.scss b/src/assets/styles/element.scss index 8de6e64..68ab98b 100644 --- a/src/assets/styles/element.scss +++ b/src/assets/styles/element.scss @@ -1,5 +1,5 @@ :root { - // --el-font-size-base: 50px; + --el-font-size-base: 18px; // --el-button-size: 80px; @@ -14,7 +14,6 @@ //--color-green: #67c23a; //--color-yellow: #e6a23c; //--color-blue: --el-color-primary; - --el-font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif; } .el-dialog { position: absolute; diff --git a/src/components/common/CascadingSelectModal/index.vue b/src/components/common/CascadingSelectModal/index.vue index db1d9e7..8dc3a32 100644 --- a/src/components/common/CascadingSelectModal/index.vue +++ b/src/components/common/CascadingSelectModal/index.vue @@ -1,5 +1,5 @@