From 9a7e7ec2803946a7f3aee7c5f044481567c54e87 Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Fri, 24 Jan 2025 21:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=AE=BE=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/N0.svg | 1 + src/assets/N1.svg | 1 + src/assets/N2.svg | 1 + src/assets/N3.svg | 1 + src/assets/N4.svg | 1 + src/assets/N5.svg | 1 + src/assets/N6.svg | 1 + src/assets/N7.svg | 1 + src/assets/N8.svg | 1 + src/assets/N9.svg | 1 + src/assets/return.svg | 1 + src/components/HeaderBar.vue | 34 ++++++++++++++++++--- src/components/TemperatureNum.vue | 36 ++++++++++++++++++++++ src/router/index.ts | 6 ++-- src/style.css | 64 ++++++++++++++++++++++++++++----------- src/views/AboutView.vue | 9 ------ src/views/EnvironmentView.vue | 60 ++++++++++++++++++++++++++++++++++++ src/views/HomeView.vue | 7 ++++- 18 files changed, 192 insertions(+), 35 deletions(-) create mode 100644 src/assets/N0.svg create mode 100644 src/assets/N1.svg create mode 100644 src/assets/N2.svg create mode 100644 src/assets/N3.svg create mode 100644 src/assets/N4.svg create mode 100644 src/assets/N5.svg create mode 100644 src/assets/N6.svg create mode 100644 src/assets/N7.svg create mode 100644 src/assets/N8.svg create mode 100644 src/assets/N9.svg create mode 100644 src/assets/return.svg create mode 100644 src/components/TemperatureNum.vue delete mode 100644 src/views/AboutView.vue create mode 100644 src/views/EnvironmentView.vue diff --git a/src/assets/N0.svg b/src/assets/N0.svg new file mode 100644 index 0000000..5be35c9 --- /dev/null +++ b/src/assets/N0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N1.svg b/src/assets/N1.svg new file mode 100644 index 0000000..d260590 --- /dev/null +++ b/src/assets/N1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N2.svg b/src/assets/N2.svg new file mode 100644 index 0000000..831aea7 --- /dev/null +++ b/src/assets/N2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N3.svg b/src/assets/N3.svg new file mode 100644 index 0000000..1bd1ca2 --- /dev/null +++ b/src/assets/N3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N4.svg b/src/assets/N4.svg new file mode 100644 index 0000000..10444b0 --- /dev/null +++ b/src/assets/N4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N5.svg b/src/assets/N5.svg new file mode 100644 index 0000000..9e0e4c0 --- /dev/null +++ b/src/assets/N5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N6.svg b/src/assets/N6.svg new file mode 100644 index 0000000..c8876e4 --- /dev/null +++ b/src/assets/N6.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N7.svg b/src/assets/N7.svg new file mode 100644 index 0000000..61957b8 --- /dev/null +++ b/src/assets/N7.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N8.svg b/src/assets/N8.svg new file mode 100644 index 0000000..ec41f81 --- /dev/null +++ b/src/assets/N8.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/N9.svg b/src/assets/N9.svg new file mode 100644 index 0000000..52f42a9 --- /dev/null +++ b/src/assets/N9.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/return.svg b/src/assets/return.svg new file mode 100644 index 0000000..e0c0ed3 --- /dev/null +++ b/src/assets/return.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue index cb148e4..2ddad54 100644 --- a/src/components/HeaderBar.vue +++ b/src/components/HeaderBar.vue @@ -2,18 +2,44 @@
logo
-

基质喷涂转印仪

+

{{ pageNameMap[route.path] }}

基质余量正常

-
- menu -

菜单

+
+ menu + return +

{{ route.path === "/" ? "菜单" : "返回" }}

diff --git a/src/components/TemperatureNum.vue b/src/components/TemperatureNum.vue new file mode 100644 index 0000000..7379872 --- /dev/null +++ b/src/components/TemperatureNum.vue @@ -0,0 +1,36 @@ + + + diff --git a/src/router/index.ts b/src/router/index.ts index 3e49915..e4fa53c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,12 +10,12 @@ const router = createRouter({ component: HomeView, }, { - path: '/about', - name: 'about', + path: '/environment', + name: 'environment', // route level code-splitting // this generates a separate chunk (About.[hash].js) for this route // which is lazy-loaded when the route is visited. - component: () => import('../views/AboutView.vue'), + component: () => import('../views/EnvironmentView.vue'), }, ], }) diff --git a/src/style.css b/src/style.css index 151ee8b..7e63a6f 100644 --- a/src/style.css +++ b/src/style.css @@ -3,30 +3,58 @@ @tailwind utilities; :root { - --primaryColor: #26509C; + --primaryColor: #26509c; --headerHeight: 54px; --footerHeight: 62px; } @layer utilities { - .btn-dark { - display: flex; + .dark-gradient { + background: linear-gradient(110deg, #0349a8 11%, #1663b7 105%); + } + .btn-dark { + display: flex; justify-content: center; align-items: center; - background: linear-gradient(90deg, #0657C0 24%, #096AE0 101%); - border-radius: 4px; - color: white; - } - .btn-light { - display: flex; + background: linear-gradient(90deg, #0657c0 24%, #096ae0 101%); + border-radius: 4px; + color: white; + } + .btn-light { + display: flex; justify-content: center; align-items: center; - background: linear-gradient(180deg, #ebf1fa 0%, #f8fafd 100%); - box-shadow: 0px -1px 0px 0px rgba(255, 255, 255, 0.3),0px 1px 5px 0px rgba(173, 173, 173, 0.47); - border-radius: 4px; - color: var(--primaryColor); - } - .main-page { - height: calc(100vh - var(--headerHeight)); - background: linear-gradient(180deg, #dfe8f7 0%, #ffffff 100%); - } + background: linear-gradient(180deg, #ebf1fa 0%, #f8fafd 100%); + box-shadow: 0px -1px 0px 0px rgba(255, 255, 255, 0.3), 0px 1px 5px 0px rgba(173, 173, 173, 0.47); + border-radius: 4px; + color: var(--primaryColor); + } + .main-page { + height: calc(100vh - var(--headerHeight)); + background: linear-gradient(180deg, #dfe8f7 0%, #ffffff 100%); + } + .shadow-card { + background: linear-gradient(180deg, #e8effa 0%, #fdfdfe 100%); + box-shadow: 0px -1px 0px 0px #ffffff, 0px 2px 6px 0px rgba(174, 174, 174, 0.2); + border-radius: 15px; + } + .true { + display: flex; + justify-content: center; + align-items: center; + color: #fff; + background-color: var(--primaryColor); + border-radius: 6px; + width: 34px; + height: 34px; + } + .false { + display: flex; + justify-content: center; + align-items: center; + color: var(--primaryColor); + background-color: #e8ecf7; + border-radius: 6px; + width: 34px; + height: 34px; + } } diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue deleted file mode 100644 index 42ffb96..0000000 --- a/src/views/AboutView.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/views/EnvironmentView.vue b/src/views/EnvironmentView.vue new file mode 100644 index 0000000..94c7897 --- /dev/null +++ b/src/views/EnvironmentView.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 4a6d28b..2ac4038 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,7 +1,7 @@