diff --git a/.env b/.env index c4ae906..fe3f0dd 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/Setting/components/History.vue b/src/components/Setting/components/History.vue new file mode 100644 index 0000000..7526610 --- /dev/null +++ b/src/components/Setting/components/History.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/components/Setting/index.vue b/src/components/Setting/index.vue index 0285010..3ad4936 100644 --- a/src/components/Setting/index.vue +++ b/src/components/Setting/index.vue @@ -31,6 +31,11 @@

消毒记录管理

操作
+
+

+

历史记录

+
查看
+
@@ -39,6 +44,7 @@ +
@@ -50,6 +56,7 @@ 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 History from './components/History.vue' import { getAllUserJSON } from '@/mock/command' import { useWebSocketStore } from '@/store' diff --git a/src/components/UpdatePreSetting.vue b/src/components/UpdatePreSetting.vue index e900efe..1671870 100644 --- a/src/components/UpdatePreSetting.vue +++ b/src/components/UpdatePreSetting.vue @@ -109,11 +109,11 @@
@@ -797,6 +797,7 @@ onMounted(() => { showkeyboard.value = false } }) + $('#id_formula').virtualkeyboard() }) diff --git a/src/public/virtualkeyboard.css b/src/public/virtualkeyboard.css index 5bfc033..6078f57 100644 --- a/src/public/virtualkeyboard.css +++ b/src/public/virtualkeyboard.css @@ -10,7 +10,7 @@ width: 750px; border: 1px solid #999; z-index: 99999; - top: 50%; + top: 45%; left: 50%; transform: translate(-50%, -50%); user-select: none; @@ -56,7 +56,7 @@ .keyboardOp > .slideDown { float: right; font-weight: bold; - color: darkviolet; + color: #06518b; cursor: pointer; padding: 0 20px; border-left: 1px solid #dbdbdb; @@ -137,5 +137,5 @@ .virtualkeyboard .func { font-size: 20px; - color: #fd910a; + color: #06518b; }