From fbcb5c02d65a37e452c81f025c149744cc6a1bc2 Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Sat, 1 Mar 2025 16:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E6=B6=82=E9=A2=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderBar.vue | 9 +++-- src/router/index.ts | 6 +++ src/style.css | 6 +-- src/views/PreSpray.vue | 89 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 src/views/PreSpray.vue diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue index a3ace06..5a7af80 100644 --- a/src/components/HeaderBar.vue +++ b/src/components/HeaderBar.vue @@ -9,9 +9,9 @@
- menu + menu return -

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

+

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

@@ -27,15 +27,16 @@ const pageNameMap: Record = { "/": "基质喷涂转印仪", "/environment": "环境设置", "/spray": "喷涂设置", + "/preSpray": "喷涂设置", "/print": "转印设置", "/menu": "菜单", }; function onMenuBtnClick() { - if (route.path !== "/") { + if (route.path !== "/home") { router.back(); } else { - router.push("/menu"); + // router.push("/menu"); } } diff --git a/src/router/index.ts b/src/router/index.ts index 9c10548..aa46f1e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,6 +3,7 @@ import HomeView from "../views/HomeView.vue"; import Login from "@/views/Login.vue"; import Index from "@/views/Index.vue"; import EnvironmentView from "../views/EnvironmentView.vue"; +import PreSpray from "@/views/PreSpray.vue"; import SprayView from "../views/SprayView.vue"; import PrintView from "../views/PrintView.vue"; import Debug from '../views/debug/index.vue' @@ -27,6 +28,11 @@ const router = createRouter({ component: EnvironmentView, }, { + path: "/preSpray", + name: "preSpray", + component: PreSpray, + }, + { path: "/spray", name: "spray", component: SprayView, diff --git a/src/style.css b/src/style.css index a6cb6d1..6021163 100644 --- a/src/style.css +++ b/src/style.css @@ -45,8 +45,7 @@ color: #fff; background-color: var(--primaryColor); border-radius: 6px; - width: 34px; - height: 34px; + padding: 6px 10px; } .false { display: flex; @@ -55,7 +54,6 @@ color: var(--primaryColor); background-color: #e8ecf7; border-radius: 6px; - width: 34px; - height: 34px; + padding: 6px 10px; } } diff --git a/src/views/PreSpray.vue b/src/views/PreSpray.vue new file mode 100644 index 0000000..30ba8be --- /dev/null +++ b/src/views/PreSpray.vue @@ -0,0 +1,89 @@ + + +