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 @@