From 29735ca9932ec4ccba47be2f648c0887252e0205 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sun, 11 May 2025 20:04:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E9=A6=96=E9=A1=B5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 4 +- src/apis/home.ts | 3 + src/apis/system.ts | 1 + src/app.vue | 12 +- src/assets/images/empty.svg | 1 + src/assets/images/error.svg | 1 + src/assets/images/ing.svg | 1 + src/assets/images/success.svg | 1 + src/assets/images/wait.svg | 1 + src/components/common/FTDialog/index.vue | 2 +- src/components/home/AddLiquid/index.vue | 176 +++++++++++++++++ src/components/home/SelectCraft/index.vue | 9 +- src/components/home/SetTemperature/index.vue | 15 +- src/components/home/Tube/index.vue | 65 +++++-- src/layouts/default.vue | 2 +- src/router/routes.ts | 4 +- src/stores/homeStore.ts | 26 ++- src/stores/systemStore.ts | 127 ++++++++++++- src/types/home.d.ts | 5 +- src/types/system.d.ts | 46 ++++- src/views/home/index.vue | 270 ++++++++++++++++++++++----- 21 files changed, 691 insertions(+), 81 deletions(-) create mode 100644 src/apis/home.ts create mode 100644 src/assets/images/empty.svg create mode 100644 src/assets/images/error.svg create mode 100644 src/assets/images/ing.svg create mode 100644 src/assets/images/success.svg create mode 100644 src/assets/images/wait.svg create mode 100644 src/components/home/AddLiquid/index.vue diff --git a/.env.test b/.env.test index d51079b..2822908 100644 --- a/.env.test +++ b/.env.test @@ -2,6 +2,6 @@ FT_NODE_ENV=test -FT_WS_URL=ws://192.168.8.168:8080/ws -FT_PROXY=http://192.168.8.88:8080 +FT_WS_URL=ws://192.168.1.199:8080/ws +FT_PROXY=http://192.168.1.199:8080 FT_API_BASE=/api \ No newline at end of file diff --git a/src/apis/home.ts b/src/apis/home.ts new file mode 100644 index 0000000..8cadf90 --- /dev/null +++ b/src/apis/home.ts @@ -0,0 +1,3 @@ +import http from 'libs/http' + +export const setTargetTemperature = (params: Home.SetTargetTemperatureParams): Promise => http.post('/heat/target-temperature', params) diff --git a/src/apis/system.ts b/src/apis/system.ts index b42f869..4802bcf 100644 --- a/src/apis/system.ts +++ b/src/apis/system.ts @@ -2,3 +2,4 @@ import http from 'libs/http' export const debugControl = (params: System.CmdControlParams): Promise => http.post('/debug/cmd', params) export const control = (params: System.CmdControlParams): Promise => http.post('/cmd', params) +export const getStatus = (): Promise => http.get('/sys/device-status') diff --git a/src/app.vue b/src/app.vue index 86859b0..20393bb 100644 --- a/src/app.vue +++ b/src/app.vue @@ -1,14 +1,18 @@ + + + + diff --git a/src/components/home/SelectCraft/index.vue b/src/components/home/SelectCraft/index.vue index e20ba17..48c548e 100644 --- a/src/components/home/SelectCraft/index.vue +++ b/src/components/home/SelectCraft/index.vue @@ -1,4 +1,5 @@ @@ -198,7 +384,7 @@ const setTemperature = (id: string) => { justify-content: flex-end; .el-row { height: fit-content; - margin-bottom: 15px; + margin-bottom: 5px; } } } From bd710da8ce7491e837ef49ed2c33aa9d18458f93 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sun, 11 May 2025 20:20:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:debug=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/SetTemperature/index.vue | 2 +- src/hooks/useActivateDebug.ts | 25 +++++++++++++++++++++++++ src/layouts/default.vue | 7 +++++-- src/stores/systemStore.ts | 5 ++++- src/types/home.d.ts | 2 +- src/types/system.d.ts | 2 +- src/views/home/index.vue | 2 +- 7 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 src/hooks/useActivateDebug.ts diff --git a/src/components/home/SetTemperature/index.vue b/src/components/home/SetTemperature/index.vue index cbf7aee..c9669a7 100644 --- a/src/components/home/SetTemperature/index.vue +++ b/src/components/home/SetTemperature/index.vue @@ -17,7 +17,7 @@ onMounted(() => { }) const form = ref({ - temperature: undefined, + temperature: 0, }) const formRef = ref() diff --git a/src/hooks/useActivateDebug.ts b/src/hooks/useActivateDebug.ts new file mode 100644 index 0000000..9d1b77e --- /dev/null +++ b/src/hooks/useActivateDebug.ts @@ -0,0 +1,25 @@ +import { useSystemStore } from 'stores/systemStore' +import { ref } from 'vue' + +export const useActivateDebug = () => { + const systemStore = useSystemStore() + const logoClickCount = ref(0) + let clickTimeout: NodeJS.Timeout | null = null + + const handleLogoClick = () => { + if (clickTimeout) { + clearTimeout(clickTimeout) + } + logoClickCount.value++ + if (logoClickCount.value === 10) { + systemStore.updateDebug() + logoClickCount.value = 0 // 重置计数器 + } + clickTimeout = setTimeout(() => { + logoClickCount.value = 0 // 重置计数器 + }, 1000) + } + return { + handleLogoClick, + } +} diff --git a/src/layouts/default.vue b/src/layouts/default.vue index b39d56a..91e93ad 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,5 +1,6 @@