diff --git a/src/assets/img/cala.png b/src/assets/img/cala.png index 350d218..60fcf28 100644 Binary files a/src/assets/img/cala.png and b/src/assets/img/cala.png differ diff --git a/src/assets/img/clock.png b/src/assets/img/clock.png index 41aa575..2c946a6 100644 Binary files a/src/assets/img/clock.png and b/src/assets/img/clock.png differ diff --git a/src/assets/img/status.png b/src/assets/img/status.png index aeecd51..bd0ebff 100644 Binary files a/src/assets/img/status.png and b/src/assets/img/status.png differ diff --git a/src/components/Header/Date.vue b/src/components/Header/Date.vue index b6a0989..92084c8 100644 --- a/src/components/Header/Date.vue +++ b/src/components/Header/Date.vue @@ -16,39 +16,40 @@ import Clock from '@/assets/img/clock.png' .date_container { display: flex; align-items: center; - padding: 13px 35px; - box-sizing: border-box; - background: #ffffff; + padding: 13px 29px; + background: #393f46; border-radius: 34px; - width: 528px; + width: 392px; + height: 68px; + border-radius: 433px; box-sizing: border-box; .cala_img { - width: 32px; - height: 30px; - margin-right: 19px; + width: 28px; + height: 26px; + margin-right: 8px; } .cala_text { font-family: Poppins; - font-size: 28px; + font-size: 22px; font-weight: 500; line-height: normal; - letter-spacing: 0.1em; - color: #393f46; + letter-spacing: 0.06em; + color: #ffffff; white-space: nowrap; } .clock_img { width: 26px; height: 26px; - margin-right: 17px; - margin-left: 36px; + margin-right: 7px; + margin-left: 22px; } .clock_text { font-family: Poppins; - font-size: 28px; + font-size: 22px; font-weight: 500; line-height: normal; - letter-spacing: 0.1em; - color: #393f46; + letter-spacing: 0.06em; + color: #ffffff; white-space: nowrap; } } diff --git a/src/components/Header/User.vue b/src/components/Header/User.vue index 2c9bcea..769edff 100644 --- a/src/components/Header/User.vue +++ b/src/components/Header/User.vue @@ -1,7 +1,45 @@ - + diff --git a/src/components/Header/index.vue b/src/components/Header/index.vue index 17ca7ab..0587b9a 100644 --- a/src/components/Header/index.vue +++ b/src/components/Header/index.vue @@ -5,12 +5,14 @@

机器运行状态

+