From 8a746794b124a3b2ac17f8cc442695fb6352053b Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 12 Jul 2023 09:34:13 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BC=BA=E9=99=B7=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/boxes/FanRuntime.vue | 2 +- .../boxes/subcomponents/TableStatus.vue | 16 ++--- src/components/groups/fault.vue | 68 +++++++++++-------- src/components/groups/monitor2.vue | 7 +- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/components/boxes/FanRuntime.vue b/src/components/boxes/FanRuntime.vue index c708879..921b3bd 100644 --- a/src/components/boxes/FanRuntime.vue +++ b/src/components/boxes/FanRuntime.vue @@ -161,7 +161,7 @@ export default { if (inData) this.tableData1.splice(this.tableData1.length, 0, inData); }, 200); if (outData) this.tableCache.push(outData); - }, 1000 * 60 * 2); + }, 1000 * 3); }, methods: { // handleMouseOver(e) { diff --git a/src/components/boxes/subcomponents/TableStatus.vue b/src/components/boxes/subcomponents/TableStatus.vue index 220c453..3033926 100644 --- a/src/components/boxes/subcomponents/TableStatus.vue +++ b/src/components/boxes/subcomponents/TableStatus.vue @@ -27,21 +27,21 @@ export default { .table-status { /* font-family: Ubuntu, sans-serif !important; */ color: #3984ff; - padding-left: adjust(10px); + padding-left: 24px; position: relative; } .table-status::after { content: ""; position: absolute; - left: adjust(1px); - top: adjust(2px); + left: 2px; + top: 8px; display: inline-block; - width: adjust(4px); - height: adjust(4px); - border-radius: adjust(100px); + width: 12px; + height: 12px; + border-radius: 100px; background: #3984ff; - box-shadow: 0px 0px adjust(2px) adjust(2px) rgba(39, 96, 255, 0.5); + box-shadow: 0px 0px 4px 4px rgba(39, 96, 255, 0.5); } .invalid { @@ -50,6 +50,6 @@ export default { .invalid::after { background: #ff0c0c; - box-shadow: 0px 0px adjust(2px) adjust(2px) rgba(255, 39, 39, 0.5); + box-shadow: 0px 0px 4px 4px rgba(255, 39, 39, 0.5); } diff --git a/src/components/groups/fault.vue b/src/components/groups/fault.vue index 76549df..bbcb99a 100644 --- a/src/components/groups/fault.vue +++ b/src/components/groups/fault.vue @@ -1,22 +1,20 @@ @@ -24,23 +22,39 @@ export default { @import "../../assets/styles/functions"; section { - background: url('../../assets/fault-analysis.png') left 144px top 4px / 79% 54% no-repeat, #ccc7; - width: adjust(w(1900px)); - height: adjust(h(1260px)); - position: absolute; - top: adjust(h(430px)); - left: adjust(w(3700px)); + width: 1920px; + height: 1080px; + position: absolute; + // top: 452px; + top: 490px; + left: 0; + background: #ccc3; } section::before { - content: '缺陷分析'; - font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif; - font-size: adjust(h(64px)); - font-weight: 400; - letter-spacing: 1px; - position: absolute; - color: $main-color; - top: 0; - left: 0; + content: "缺陷分析"; + font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, + Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, + "微软雅黑", Arial, Helvetica, sans-serif; + font-size: 80px; + font-weight: 400; + letter-spacing: 1px; + color: $main-color; + position: absolute; + top: -128px; + left: 0; +} + +section::after { + content: ""; + display: inline-block; + width: 110%; + height: 100%; + position: absolute; + top: -128px; + left: 0; + background: url("../../assets/fault-analysis.png") no-repeat; + background-position: 356px 20px; + background-size: 78%; } diff --git a/src/components/groups/monitor2.vue b/src/components/groups/monitor2.vue index 1667025..f97da64 100644 --- a/src/components/groups/monitor2.vue +++ b/src/components/groups/monitor2.vue @@ -26,9 +26,12 @@ export default { section { background: rgba(47, 203, 255, 0.225); width: 100%; - height: 1178px; + // height: 1178px; + height: 1469px; position: absolute; - bottom: 720px; + // bottom: 690px; + // top: 2160px; + top: 1570px; left: 0; }