diff --git a/src/assets/eq.png b/src/assets/eq.png index 604c2d9..b5bd164 100644 Binary files a/src/assets/eq.png and b/src/assets/eq.png differ diff --git a/src/assets/header.png b/src/assets/header.png index d51195d..2804737 100644 Binary files a/src/assets/header.png and b/src/assets/header.png differ diff --git a/src/components/groups/monitor2.vue b/src/components/groups/monitor2.vue index f97da64..d18897c 100644 --- a/src/components/groups/monitor2.vue +++ b/src/components/groups/monitor2.vue @@ -24,14 +24,14 @@ export default { @import "../../assets/styles/functions"; section { - background: rgba(47, 203, 255, 0.225); + background: rgba(47, 203, 255, 0.75); width: 100%; // height: 1178px; height: 1469px; position: absolute; // bottom: 690px; // top: 2160px; - top: 1570px; + // top: 1570px; left: 0; } diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index 7cb5b16..32abcdd 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -69,29 +69,29 @@ export default { header { width: 100%; - height: 628px; + height: 380px; background: url(../../assets/header.png) no-repeat; display: grid; place-items: center; >div { - margin-left: 378px; - margin-bottom: 72px; + margin-left: 24px; + margin-bottom: 24px; display: flex; align-items: center; .header--logo { width: 648px; - height: 337px; - margin-right: 96px; + height: 280px; + margin-right: 100px; background: url(../../assets/logo.png) center/contain no-repeat; } h1 { - font-size: 220px; + font-size: 128px; line-height: 330px; margin: 0; - letter-spacing: 36px; + letter-spacing: 24px; user-select: none; font-weight: 600; color: $main-color; @@ -101,25 +101,27 @@ header { } .header--wing { - top: 138px; + bottom: -88px; left: 0; - line-height: 130px; - font-size: 130px; + line-height: 1; + font-size: 72px; + // font-weight: bold; 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; } .company { - left: 240px; + left: 300px; text-align: center; - color: lighten($main-color, 8); + // color: lighten($main-color, 8); + color: #5a6d88; } .datetime { left: unset; - right: 240px; - color: $main-color; + right: 300px; + color: #5a6d88; text-align: center; - color: lighten($main-color, 8); - font-size: 140px; + font-size: 72px; + line-height: 1; } diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue index 6ae3134..57b69ac 100644 --- a/src/components/layout/Main.vue +++ b/src/components/layout/Main.vue @@ -1,18 +1,18 @@ @@ -106,8 +106,8 @@ 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 MonitorGroup2 from "../groups/monitor2.vue"; +// import DataGroup from "../groups/data.vue"; import FaultAnalysis from "../groups/fault.vue"; import Environ from "../groups/environ.vue"; import { mapMutations, mapState } from "vuex"; @@ -118,8 +118,8 @@ export default { name: "Main", components: { Runtime, - DataGroup, - MonitorGroup2, + // DataGroup, + // MonitorGroup2, Environ, FaultAnalysis, AreaOne, @@ -202,8 +202,8 @@ main { .arrow { display: inline-block; - width: 64px; - height: 64px; + width: 32px; + height: 32px; border-radius: 100%; position: absolute; background: #ff5757; @@ -235,22 +235,22 @@ main { .swd { // background-size: 100% 10px; - width: 350px; - height: 202px; + width: 240px; + height: 90px; position: absolute; - transform: rotateY(180deg); + // transform: rotateY(180deg); p { margin: 0; color: #000; - margin-top: 16px; + margin-top: 8px; } .swd-box { - margin-left: 54px; - margin-top: 44px; - font-size: 30px; - letter-spacing: 2px; + margin-left: 32px; + margin-top: 10px; + font-size: 20px; + // letter-spacing: 2px; color: #000; font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, @@ -258,8 +258,9 @@ main { .swd-value { color: #ff2020; - margin-top: 12px; - font-size: 64px; + margin-top: 0; + margin-bottom: 12px; + font-size: 48px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -270,43 +271,41 @@ main { .onekb, .onesp { - background: url(../../assets/tem-bottom.png) top 0 left 0 / 100% no-repeat; + background: url(../../assets/tem-bottom.png) 0 0 / 100% no-repeat; } .onekb { - top: 760px; - left: 1560px; + top: 520px; + right: 1000px; } .onesp { - top: 860px; - left: 1100px; + top: 590px; + right: 690px; } .twokb, .twosp { - background: url(../../assets/tem-top.png) top 0 left 0 / 100% no-repeat; + background: url(../../assets/tem-top.png) right 0 bottom 0 / 100% no-repeat; } .twokb { - top: 72px; - left: 1580px; + top: 108px; + right: 1020px; } .twosp { - top: -32px; - left: 1080px; + top: 32px; + right: 700px; } .eq-main { - width: 9162px; - height: 1178px; - background: url(../../assets/eq.png) no-repeat; + width: 100%; + height: 800px; + background: url(../../assets/eq.png) no-repeat, #0003; background-size: 100%; top: 256px; - left: 2172px; position: relative; - transform: rotateY(0.5turn); } .eq-main::before { diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 7874e5d..2a8bcd6 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -8,26 +8,39 @@
- -
+
+
+ +
+
+
+ + + + + +
+ + \ No newline at end of file