From 572e9e0d5e0b5f6d316fe6d32e36178d94783148 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 9 Nov 2023 15:46:04 +0800 Subject: [PATCH] update --- .../Common/FanRunFrequence/index.jsx | 2 +- .../Common/FanRunFrequence/index.module.css | 4 ++ src/components/Common/TimeFireDir/index.jsx | 1 - .../Common/TimeFireDir/leftbox.module.scss | 53 +++++++++---------- src/index.css | 8 +++ 5 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/components/Common/FanRunFrequence/index.jsx b/src/components/Common/FanRunFrequence/index.jsx index 85e9353..8751cce 100644 --- a/src/components/Common/FanRunFrequence/index.jsx +++ b/src/components/Common/FanRunFrequence/index.jsx @@ -167,7 +167,7 @@ function WindFrequence(props) { return ( { useEffect(() => { const restTime = ctx?.runState?.lastFireChangeTime; if (restTime == null) return; - console.log("restTime is:", restTime); let timer = null; if (/分/.test(restTime) && /秒/.test(restTime)) { let [min, sec] = restTime.replace(/分/, ":").replace(/秒/, "").split(":"); diff --git a/src/components/Common/TimeFireDir/leftbox.module.scss b/src/components/Common/TimeFireDir/leftbox.module.scss index 6e8cfcc..23273fa 100644 --- a/src/components/Common/TimeFireDir/leftbox.module.scss +++ b/src/components/Common/TimeFireDir/leftbox.module.scss @@ -1,33 +1,30 @@ .leftbox { - // width: 440px; - // background: rgb(127, 202, 42); + .box { + margin-right: 16px; + width: 200px; + padding: 12px; + background: url(../../../assets/CenterChart2ItemBg.png); + background-repeat: no-repeat; + background-size: 100% 100%; + display: flex; + align-items: flex-start; + user-select: none; - .box { - margin-right: 16px; - width: 200px; - padding: 8px; - background: url(../../../assets/CenterChart2ItemBg.png); - background-repeat: no-repeat; - background-size: 100% 100%; - display: flex; - align-items: flex-start; - user-select: none; + .box__inner { + padding-top: 12px; - .box__inner { - padding-top: 12px; + .box__label { + color: #fffa; + font-size: 18px; + line-height: 1; + } - .box__label { - color: #fffa; - font-size: 18px; - line-height: 14px; - } - - .box__value { - color: #fff; - font-weight: 400; - font-size: 30px; - line-height: 34px; - } - } - } + .box__value { + color: #fff; + font-weight: 400; + font-size: 30px; + line-height: 56px; + } + } + } } diff --git a/src/index.css b/src/index.css index 976ee32..82484fe 100644 --- a/src/index.css +++ b/src/index.css @@ -2,6 +2,14 @@ box-sizing: border-box; } +h1, +h2, +h3, +h4, +h5 { + margin: 0; +} + html, body { margin: 0;