From 5b2b026fdcc093f87fab3c4128a4fca3967b6890 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 5 Sep 2023 14:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Operator.vue           |  5 +++--
 src/components/Progress.vue           | 10 +++++++--
 src/components/dialogs/LoginModal.vue | 38 ++++++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/components/Operator.vue b/src/components/Operator.vue
index 6e5cf11..916159d 100644
--- a/src/components/Operator.vue
+++ b/src/components/Operator.vue
@@ -124,7 +124,7 @@
         <p>SET</p>
       </div>
       <div class="set_form">
-        <p class="textP">40</p>
+        <p class="textP">{{ settingStore.sprinklerPumpRPM }}</p>
         <div class="log" @click="showLogPicker">{{ logVal }}</div>
       </div>
       <svg
@@ -460,13 +460,14 @@ import WarnModal from 'cpns/dialogs/WarnModal'
 import DisinfectantLiquidInfo from 'cpns/info/DisinfectantLiquidInfo'
 import EnvironmentInfo from 'cpns/info/EnvironmentInfo'
 import { ref, watch, onMounted, onUnmounted } from 'vue'
-import { useOperatorStore, useWebSocketStore } from '@/store'
+import { useOperatorStore, useWebSocketStore, useSettingStore } from '@/store'
 import { startDisinfectionJSON, getStateJSON } from '@/mock/command'
 import { showSuccessToast, showFailToast } from 'vant'
 import { time_To_hhmmss } from '@/utils'
 
 const operatorStore = useOperatorStore()
 const webSocketStore = useWebSocketStore()
+const settingStore = useSettingStore()
 const disinfectWarnVisible = ref(false)
 
 const preVisible = ref(false)
diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index 3c6ce02..e213b6e 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -143,7 +143,7 @@
     <div class="detail_wrap">
       <div class="tip_info">警报信息</div>
       <div class="speed_wrap">
-        <p class="speed">40</p>
+        <p class="speed">{{ settingStore.sprinklerPumpRPM }}</p>
       </div>
       <svg
         @click="showDetail"
@@ -203,7 +203,12 @@
 </template>
 
 <script setup>
-import { useOperatorStore, useWebSocketStore, useEchartsStore } from '@/store'
+import {
+  useOperatorStore,
+  useWebSocketStore,
+  useEchartsStore,
+  useSettingStore,
+} from '@/store'
 import { time_To_hhmmss } from '@/utils'
 import {
   stopDisinfectionJSON,
@@ -217,6 +222,7 @@ import * as echarts from 'echarts'
 import { storeToRefs } from 'pinia'
 
 const echartsStore = useEchartsStore()
+const settingStore = useSettingStore()
 
 const binLocal = computed(() => {
   return echartsStore?.binCharts || localStorage.getItem('bin')
diff --git a/src/components/dialogs/LoginModal.vue b/src/components/dialogs/LoginModal.vue
index 4c566b8..f3163fd 100644
--- a/src/components/dialogs/LoginModal.vue
+++ b/src/components/dialogs/LoginModal.vue
@@ -1,7 +1,14 @@
 <template>
   <div class="login_modal_container">
     <div class="modal_content">
-      <LoginForm :hideLoginModal="hideLoginModal" :modal="true" />
+      <LoginForm
+        :handleShowKey="handleShowKey"
+        :clearInput="clearInput"
+        :input="input"
+        :handleHideKey="handleHideKey"
+        :hideLoginModal="hideLoginModal"
+        :modal="true"
+      />
       <svg
         @click="closeModal"
         class="close"
@@ -22,11 +29,16 @@
         </g>
       </svg>
     </div>
+    <div class="key_wrap" v-if="showkeyboard">
+      <SimpleKeyboard @onChange="onChange" :input="input" />
+    </div>
   </div>
 </template>
 
 <script setup>
+import { ref } from 'vue'
 import LoginForm from 'cpns/LoginForm'
+import SimpleKeyboard from 'cpns/SimpleKeyboard'
 
 const props = defineProps({
   hideLoginModal: {
@@ -34,6 +46,23 @@ const props = defineProps({
   },
 })
 
+const input = ref('')
+const onChange = a => {
+  input.value = a
+}
+
+const clearInput = () => {
+  input.value = ''
+}
+
+const showkeyboard = ref(false)
+const handleShowKey = () => {
+  showkeyboard.value = true
+}
+const handleHideKey = () => {
+  showkeyboard.value = false
+}
+
 const closeModal = () => {
   props.hideLoginModal()
 }
@@ -51,6 +80,13 @@ const closeModal = () => {
   display: flex;
   align-items: center;
   justify-content: center;
+  .key_wrap {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 230px;
+  }
   .modal_content {
     width: 476px;
     height: 414px;