From dec7d73d8fd7de25dd9dec0082963a8f2b7ac29d Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Thu, 27 Feb 2025 13:41:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/{layout => }/arrow/arrow-down.png | Bin .../images/{layout => }/arrow/arrow-item.png | Bin .../images/{layout => }/arrow/arrow-left.png | Bin .../images/{layout => }/arrow/arrow-right.png | Bin .../images/{layout => }/arrow/arrow-up.png | Bin src/assets/images/{layout => }/car/car-1.png | Bin src/assets/images/{layout => }/car/car-2.png | Bin src/assets/styles/animations/animations.scss | 1 + src/assets/styles/animations/src/rotate.scss | 19 +++++++++ src/assets/styles/common/common.scss | 3 ++ src/assets/styles/common/src/element.scss | 10 +++++ src/assets/styles/global.scss | 31 +------------- src/components/HelloWorld.vue | 40 ------------------ .../Layout}/MainCenterItem.vue | 2 +- .../Layout}/MainCenterPercent.vue | 6 +-- src/layout/components/AppMain/MainCenter.vue | 6 +-- src/layout/components/AppMain/MainLeft.vue | 37 ++++++++++------ src/layout/components/AppMain/MainRight.vue | 14 +++--- src/layout/components/AppMain/data.ts | 8 ++-- src/layout/components/Footer/index.vue | 25 ++++++++--- src/layout/components/NavBar/index.vue | 38 +++++++++++++---- src/layout/index.vue | 10 +++-- uno.config.ts | 6 +++ 23 files changed, 138 insertions(+), 118 deletions(-) rename src/assets/images/{layout => }/arrow/arrow-down.png (100%) rename src/assets/images/{layout => }/arrow/arrow-item.png (100%) rename src/assets/images/{layout => }/arrow/arrow-left.png (100%) rename src/assets/images/{layout => }/arrow/arrow-right.png (100%) rename src/assets/images/{layout => }/arrow/arrow-up.png (100%) rename src/assets/images/{layout => }/car/car-1.png (100%) rename src/assets/images/{layout => }/car/car-2.png (100%) create mode 100644 src/assets/styles/animations/animations.scss create mode 100644 src/assets/styles/animations/src/rotate.scss create mode 100644 src/assets/styles/common/common.scss create mode 100644 src/assets/styles/common/src/element.scss delete mode 100644 src/components/HelloWorld.vue rename src/{layout/components/AppMain/components => components/Layout}/MainCenterItem.vue (91%) rename src/{layout/components/AppMain/components => components/Layout}/MainCenterPercent.vue (83%) diff --git a/src/assets/images/layout/arrow/arrow-down.png b/src/assets/images/arrow/arrow-down.png similarity index 100% rename from src/assets/images/layout/arrow/arrow-down.png rename to src/assets/images/arrow/arrow-down.png diff --git a/src/assets/images/layout/arrow/arrow-item.png b/src/assets/images/arrow/arrow-item.png similarity index 100% rename from src/assets/images/layout/arrow/arrow-item.png rename to src/assets/images/arrow/arrow-item.png diff --git a/src/assets/images/layout/arrow/arrow-left.png b/src/assets/images/arrow/arrow-left.png similarity index 100% rename from src/assets/images/layout/arrow/arrow-left.png rename to src/assets/images/arrow/arrow-left.png diff --git a/src/assets/images/layout/arrow/arrow-right.png b/src/assets/images/arrow/arrow-right.png similarity index 100% rename from src/assets/images/layout/arrow/arrow-right.png rename to src/assets/images/arrow/arrow-right.png diff --git a/src/assets/images/layout/arrow/arrow-up.png b/src/assets/images/arrow/arrow-up.png similarity index 100% rename from src/assets/images/layout/arrow/arrow-up.png rename to src/assets/images/arrow/arrow-up.png diff --git a/src/assets/images/layout/car/car-1.png b/src/assets/images/car/car-1.png similarity index 100% rename from src/assets/images/layout/car/car-1.png rename to src/assets/images/car/car-1.png diff --git a/src/assets/images/layout/car/car-2.png b/src/assets/images/car/car-2.png similarity index 100% rename from src/assets/images/layout/car/car-2.png rename to src/assets/images/car/car-2.png diff --git a/src/assets/styles/animations/animations.scss b/src/assets/styles/animations/animations.scss new file mode 100644 index 0000000..81e9eb9 --- /dev/null +++ b/src/assets/styles/animations/animations.scss @@ -0,0 +1 @@ +@use "src/rotate"; \ No newline at end of file diff --git a/src/assets/styles/animations/src/rotate.scss b/src/assets/styles/animations/src/rotate.scss new file mode 100644 index 0000000..7782abf --- /dev/null +++ b/src/assets/styles/animations/src/rotate.scss @@ -0,0 +1,19 @@ +/* 旋转动画 */ +@keyframes rotate { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +/* 反向旋转动画 */ +@keyframes rotate-reverse { + from { + transform: rotate(0deg); + } + to { + transform: rotate(-360deg); + } +} diff --git a/src/assets/styles/common/common.scss b/src/assets/styles/common/common.scss new file mode 100644 index 0000000..936448b --- /dev/null +++ b/src/assets/styles/common/common.scss @@ -0,0 +1,3 @@ +@use "src/element"; + + diff --git a/src/assets/styles/common/src/element.scss b/src/assets/styles/common/src/element.scss new file mode 100644 index 0000000..3b7b9a2 --- /dev/null +++ b/src/assets/styles/common/src/element.scss @@ -0,0 +1,10 @@ +// 空心的虚线圆 +.dashed-circle { + width: 46px; /* 圆圈的宽度 */ + height: 46px; /* 圆圈的高度 */ + line-height: 40px; + font-size: 16px; + text-align: center; + border: 2px dashed; /* 边框宽度、样式和颜色 */ + border-radius: 50%; /* 将元素变成圆形 */ +} diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss index 4c9c395..52d1fb2 100644 --- a/src/assets/styles/global.scss +++ b/src/assets/styles/global.scss @@ -1,29 +1,2 @@ -.dashed-circle { - width: 46px; /* 圆圈的宽度 */ - height: 46px; /* 圆圈的高度 */ - line-height: 40px; - font-size: 16px; - text-align: center; - border: 2px dashed; /* 边框宽度、样式和颜色 */ - border-radius: 50%; /* 将元素变成圆形 */ -} - -/* 旋转动画 */ -@keyframes rotate { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} - -/* 反向旋转动画 */ -@keyframes rotate-reverse { - from { - transform: rotate(0deg); - } - to { - transform: rotate(-360deg); - } -} +@use "animations/animations"; +@use "common/common"; \ No newline at end of file diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index cffd4c5..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/src/layout/components/AppMain/components/MainCenterItem.vue b/src/components/Layout/MainCenterItem.vue similarity index 91% rename from src/layout/components/AppMain/components/MainCenterItem.vue rename to src/components/Layout/MainCenterItem.vue index e3f1a7b..5db3b32 100644 --- a/src/layout/components/AppMain/components/MainCenterItem.vue +++ b/src/components/Layout/MainCenterItem.vue @@ -15,7 +15,7 @@ defineProps({ arrow-item diff --git a/src/layout/components/AppMain/components/MainCenterPercent.vue b/src/components/Layout/MainCenterPercent.vue similarity index 83% rename from src/layout/components/AppMain/components/MainCenterPercent.vue rename to src/components/Layout/MainCenterPercent.vue index db42ef9..e696efd 100644 --- a/src/layout/components/AppMain/components/MainCenterPercent.vue +++ b/src/components/Layout/MainCenterPercent.vue @@ -3,10 +3,10 @@ defineProps({ percent: Number, }); -import ArrowDown from '@/assets/images/layout/arrow/arrow-down.png'; -import ArrowUp from '@/assets/images/layout/arrow/arrow-up.png'; +import ArrowDown from '@/assets/images/arrow/arrow-down.png'; +import ArrowUp from '@/assets/images/arrow/arrow-up.png'; -const calPercentItem: Element = (percent: number) => { +const calPercentItem = (percent: number): Element => { return percent > 25 ? (
arrow diff --git a/src/layout/components/AppMain/MainCenter.vue b/src/layout/components/AppMain/MainCenter.vue index f924194..a0b1360 100644 --- a/src/layout/components/AppMain/MainCenter.vue +++ b/src/layout/components/AppMain/MainCenter.vue @@ -1,6 +1,6 @@