diff --git a/src/assets/top-middle.png b/src/assets/top-middle.png index f4025f8..8719494 100644 Binary files a/src/assets/top-middle.png and b/src/assets/top-middle.png differ diff --git a/src/components/common/SmallBox2.vue b/src/components/common/SmallBox2.vue index 8bb68de..f6fa384 100644 --- a/src/components/common/SmallBox2.vue +++ b/src/components/common/SmallBox2.vue @@ -59,38 +59,38 @@ export default { flex-shrink: 0; padding: 0; user-select: none; - width: adjust(w(820px)); - height: adjust(h(350px)); + width: 744px; + height: 366px; display: flex; background: url(../../assets/top-middle.png) no-repeat; background-size: 100% 100%; background-position: bottom; .icon { - margin-top: adjust(h(56px)); - margin-left: adjust(w(24px)); - width: adjust(h(172px)); - height: adjust(h(172px)); + margin-top: 48px; + margin-left: 48px; + width: 172px; + height: 172px; } .info { - margin-top: adjust(h(56px)); + margin-top: 56px; flex: 1 auto; font-family: "微软雅黑", sans-serif; - padding-left: adjust(5px); - + padding-left: 12px; h2 { - font-size: adjust(12px); + font-size: 54px; + line-height: 48px; opacity: 0.7; - letter-spacing: adjust(1px); + letter-spacing: 2px; font-weight: 400; color: hsla(0, 0%, 0%, 0.9); } .value { color: #030609; - font-size: adjust(18px); - line-height: adjust(22px); + font-size: 96px; + line-height: 98px; } } } diff --git a/src/components/groups/environ.vue b/src/components/groups/environ.vue index 338a78e..d40df69 100644 --- a/src/components/groups/environ.vue +++ b/src/components/groups/environ.vue @@ -1,22 +1,20 @@ @@ -24,24 +22,38 @@ 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(15300px)); - left: adjust(w(15500px)); + width: 1920px; + height: 1080px; + position: absolute; + top: 490px; + right: 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: 2px; + position: absolute; + color: $main-color; + top: -128px; + left: 0; +} + +section::after { + content: ""; + display: inline-block; + width: 100%; + height: 100%; + background: url("../../assets/fault-analysis.png") left 360px top 18px / 90% + no-repeat; + position: absolute; + color: $main-color; + top: -128px; + left: 0; } diff --git a/src/components/icons/clockSvg.vue b/src/components/icons/clockSvg.vue index bf4a6cf..12e0cbb 100644 --- a/src/components/icons/clockSvg.vue +++ b/src/components/icons/clockSvg.vue @@ -1,7 +1,5 @@ @@ -74,43 +84,44 @@ export default { @import "../../assets/styles/functions"; .isolate-area-1 { - display: flex; - color: $main-color; - min-width: 300px; - align-items: center; + display: flex; + color: $main-color; + min-width: 300px; + align-items: flex-end; - > *:not(:last-child) { - margin: { - right: adjust(10px); - } - } + > *:not(:last-child) { + margin: { + right: 128px; + } + } - > .data { - flex-shrink: 0; - font-family: zcoolqingkehuangyouti-Regular, sans-serif; - display: flex; - align-items: flex-end; - } + > .data { + flex-shrink: 0; + font-family: zcoolqingkehuangyouti-Regular, sans-serif; + display: flex; + align-items: flex-end; + } - > .data > span:not(.dot) { - /** 边框 */ - background: url('../../assets/digitbox1.png') no-repeat; - background-size: 100% 100%; - display: inline-block; - width: adjust(w(220px)); - height: adjust(h(260px)); - color: #0068ffaa; - font-size: h(200px); - line-height: h(600px); - text-align: center; - vertical-align: bottom; - } - - > .data > span.digit { - /** 数字字体大小 */ - color: #0071ff; - font-size: h(360px); - line-height: h(540px); - } + > .data > span:not(.dot) { + /** 边框 */ + background: url("../../assets/digitbox1.png") no-repeat; + background-size: 100% 100%; + display: inline-block; + width: 228px; + height: 299px; + color: #0068ffaa; + font-size: 142px; + line-height: 328px; + text-align: center; + vertical-align: bottom; + user-select: none; + } + + > .data > span.digit { + /** 数字字体大小 */ + color: #0071ff; + font-size: 242px; + line-height: 286px; + } } diff --git a/src/components/isolate-area-1/Runtime.vue b/src/components/isolate-area-1/Runtime.vue new file mode 100644 index 0000000..694317c --- /dev/null +++ b/src/components/isolate-area-1/Runtime.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue index 116656a..e29854e 100644 --- a/src/components/layout/Main.vue +++ b/src/components/layout/Main.vue @@ -14,7 +14,7 @@
-
+ + @@ -67,6 +68,7 @@ import InWater from "../boxes/InWater.vue"; import OutWater from "../boxes/OutWater.vue"; import AreaOne from "../isolate-area-1/Area.vue"; +import Runtime from "../isolate-area-1/Runtime.vue"; import MonitorGroup2 from '../groups/monitor2.vue' import DataGroup from '../groups/data.vue' import FaultAnalysis from '../groups/fault.vue' @@ -78,6 +80,7 @@ import WsClient from "../../utils/wsClass"; export default { name: "Main", components: { + Runtime, DataGroup, MonitorGroup2, Environ, @@ -125,8 +128,14 @@ main { .area-one { position: absolute; - top: adjust(150px); - left: adjust(1310px); + top: 124px; + left: 3910px; +} + +.runtime { + position: absolute; + top: 0; + right: 0; } .video-crash {