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/Setting/components/PreSetting.vue b/src/components/PreSetting.vue similarity index 94% rename from src/components/Setting/components/PreSetting.vue rename to src/components/PreSetting.vue index 1cc5d4d..1682cf9 100644 --- a/src/components/Setting/components/PreSetting.vue +++ b/src/components/PreSetting.vue @@ -217,6 +217,10 @@ :show="continued_humiShow" @blur="continued_humiShow = false" /> +
+
保存
+
返回
+
@@ -257,6 +261,16 @@ const continued_humiShow = ref(false) const isFirstClick = ref(true) +const props = defineProps({ + hideSettingModal: { + type: Function, + }, +}) + +const hiddleSettingModal = () => { + props.hideSettingModal() +} + const hideClickKey = flag => { isFirstClick.value = true stoped_humiShow.value = false @@ -653,9 +667,40 @@ const setSprayLiquidVal = () => { height: 580px; display: grid; overflow: scroll; - grid-template-columns: repeat(1, 1fr); + grid-template-columns: repeat(2, 1fr); row-gap: 20px; - padding-bottom: 40px; + column-gap: 20px; + padding: 20px; + padding-bottom: 180px; + position: relative; + .btns { + position: absolute; + right: 20px; + bottom: 20px; + width: 300px; + height: 68px; + display: flex; + align-items: center; + justify-content: flex-end; + .btn { + width: 111px; + height: 38px; + border-radius: 19px; + background: #06518b; + display: flex; + align-items: center; + justify-content: center; + font-family: Source Han Sans CN; + font-size: 14px; + font-weight: normal; + line-height: normal; + letter-spacing: 0.1em; + color: #ffffff; + } + .ml { + margin-left: 20px; + } + } .row_wrap { // width: 726px; height: 80px; @@ -668,6 +713,7 @@ const setSprayLiquidVal = () => { justify-content: space-between; .title { font-family: Zona Pro; + white-space: nowrap; font-size: 20px; font-weight: normal; letter-spacing: 0.06em; 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;