From 780b987f84d19ef5c32f42238780309847183656 Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Tue, 5 Sep 2023 00:54:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 8 +- src/components/Formula.vue | 234 +++++++ src/components/PreSetting.vue | 747 +++++++++++++++++++++++ src/components/Setting/components/PreSetting.vue | 701 --------------------- src/components/Setting/components/PreTable.vue | 174 ------ src/components/Setting/index.vue | 6 +- src/pages/Home.vue | 29 +- 7 files changed, 1015 insertions(+), 884 deletions(-) create mode 100644 src/components/Formula.vue create mode 100644 src/components/PreSetting.vue delete mode 100644 src/components/Setting/components/PreSetting.vue delete mode 100644 src/components/Setting/components/PreTable.vue diff --git a/.env b/.env index fe3f0dd..c4ae906 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ -VITE_BASE_WS1_URL=ws://192.168.8.10:19001/ -VITE_BASE_WS2_URL=ws://192.168.8.10:19002/ +# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/ +# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/ -# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/ -# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/ \ No newline at end of file +VITE_BASE_WS1_URL=ws://127.0.0.1:19001/ +VITE_BASE_WS2_URL=ws://127.0.0.1:19002/ \ No newline at end of file diff --git a/src/components/Formula.vue b/src/components/Formula.vue new file mode 100644 index 0000000..38bff1e --- /dev/null +++ b/src/components/Formula.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/components/PreSetting.vue b/src/components/PreSetting.vue new file mode 100644 index 0000000..1682cf9 --- /dev/null +++ b/src/components/PreSetting.vue @@ -0,0 +1,747 @@ + + + + + diff --git a/src/components/Setting/components/PreSetting.vue b/src/components/Setting/components/PreSetting.vue deleted file mode 100644 index 1cc5d4d..0000000 --- a/src/components/Setting/components/PreSetting.vue +++ /dev/null @@ -1,701 +0,0 @@ - - - - - diff --git a/src/components/Setting/components/PreTable.vue b/src/components/Setting/components/PreTable.vue deleted file mode 100644 index 1d4f666..0000000 --- a/src/components/Setting/components/PreTable.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - diff --git a/src/components/Setting/index.vue b/src/components/Setting/index.vue index 6099d3e..fdf3894 100644 --- a/src/components/Setting/index.vue +++ b/src/components/Setting/index.vue @@ -26,11 +26,11 @@

操作日志导出

导出
-
+
@@ -38,7 +38,6 @@ -
@@ -50,7 +49,6 @@ import Date from './components/Date.vue' import Device from './components/Device.vue' import User from './components/User.vue' import ExportExcel from './components/ExportExcel.vue' -import PreTable from './components/PreTable.vue' import { getAllUserJSON } from '@/mock/command' import { useWebSocketStore } from '@/store' diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 5ff9217..ecca70c 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -166,6 +166,31 @@

审计

+
+ + + + + +

配方管理

+
+

IP {{ settingStore.deviceIp }}

@@ -284,6 +310,7 @@ import { ref, onMounted, onBeforeUnmount } from 'vue' import LoginModal from 'cpns/dialogs/LoginModal' import SimpleKeyboard from 'cpns/SimpleKeyboard' import moment from 'moment' +import Formula from 'cpns/Formula' import Operator from 'cpns/Operator' import Audit from 'cpns/Audit' import DisinfectionSetting from 'cpns/DisinfectionSetting' @@ -416,7 +443,7 @@ const handleLogout = () => { align-items: center; margin-bottom: 19px; .tab_btn { - width: 199px; + width: 171px; height: 58px; border-radius: 29px; box-sizing: border-box;