From 993e659704781947b215788415aca24a1f0e9cef Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 5 Sep 2023 15:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=9C=BA=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                       |  8 ++++----
 src/components/Setting/components/User.vue | 26 ++++++++++++++++++++++----
 src/components/Test.vue                    |  2 +-
 src/components/dialogs/UserModal.vue       |  9 ++++++++-
 src/mock/command.js                        | 26 ++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 10 deletions(-)

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/Setting/components/User.vue b/src/components/Setting/components/User.vue
index e35872f..2d46137 100644
--- a/src/components/Setting/components/User.vue
+++ b/src/components/Setting/components/User.vue
@@ -86,7 +86,7 @@
           <div class="operator_wrap">
             <div
               class="common_btn style-btn"
-              @click="showUserModal(`${item.uid} 用户删除`)"
+              @click="showUserModal(`${item.uid} 用户删除`, item.uid, 1)"
               v-if="item.permission_level == 3"
             >
               删除用户
@@ -94,7 +94,7 @@
             <div
               class="common_btn mb style-btn"
               v-if="item.permission_level == 3"
-              @click="showUserModal(`${item.uid} 设置为管理员`)"
+              @click="showUserModal(`${item.uid} 设置为管理员`, item.uid, 2)"
             >
               设为管理员
             </div>
@@ -110,6 +110,7 @@
     </div>
     <UserModal
       v-if="userModalVisible"
+      :handleOk="handleOk"
       :hideUserModal="hideUserModal"
       :userWarnInfo="userWarnInfo"
     />
@@ -130,7 +131,12 @@ import SimpleKeyboard from 'cpns/SimpleKeyboard'
 import Eye from '@/assets/img/login/eye.png'
 import Open from '@/assets/img/login/open.png'
 import { useUserStore, useWebSocketStore } from '@/store'
-import { chpasswdJSON } from '@/mock/command'
+import {
+  chpasswdJSON,
+  updateUserPermissionLevelJSON,
+  delUserJSON,
+  addUserJson,
+} from '@/mock/command'
 
 const showkeyboard = ref(false)
 const hideKeyBoard = () => {
@@ -212,13 +218,25 @@ const addUserFormShow = () => {
 }
 
 const userWarnInfo = ref('')
-const showUserModal = info => {
+const currDelUserId = ref('')
+const userModalFlag = ref(1)
+const showUserModal = (info, uid, f) => {
+  userModalFlag.value = f
   userWarnInfo.value = info
+  currDelUserId.value = uid
   userModalVisible.value = true
 }
 const hideUserModal = () => {
   userModalVisible.value = false
 }
+
+const handleOk = () => {
+  if (userModalFlag.value == 1) {
+    // 删除
+  } else {
+    // 修改
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/Test.vue b/src/components/Test.vue
index 1460bf7..3242c03 100644
--- a/src/components/Test.vue
+++ b/src/components/Test.vue
@@ -119,7 +119,7 @@
     </div>
     <div class="common_set switch_wrap">
       <p class="title">风机</p>
-      <p class="num">{{ testStore?.airBlowerObj?.currentVal }} r/min</p>
+      <p class="num">{{ testStore?.airBlowerObj?.currentVal }} A</p>
       <div class="btn_wrap">
         <div
           :class="testStore.draughtFan ? 'close style-btn' : 'open style-btn'"
diff --git a/src/components/dialogs/UserModal.vue b/src/components/dialogs/UserModal.vue
index 6dc358b..4a58b5a 100644
--- a/src/components/dialogs/UserModal.vue
+++ b/src/components/dialogs/UserModal.vue
@@ -22,7 +22,7 @@
         请确认是否将 <span class="red">{{ userWarnInfo }}</span>
       </p>
       <div class="btns">
-        <div class="ok style-btn">确定</div>
+        <div class="ok style-btn" @click="ok">确定</div>
         <div class="cancel style-btn" @click="handleCancel">取消</div>
       </div>
     </div>
@@ -37,8 +37,15 @@ const props = defineProps({
   hideUserModal: {
     type: Function,
   },
+  handleOk: {
+    type: Function,
+  },
 })
 
+const ok = () => {
+  props.handleOk()
+}
+
 const handleCancel = () => {
   props.hideUserModal()
 }
diff --git a/src/mock/command.js b/src/mock/command.js
index d6bf1fe..34c87ef 100644
--- a/src/mock/command.js
+++ b/src/mock/command.js
@@ -185,3 +185,29 @@ export const changeDisinfectionParameterJSON = data => {
     ...data,
   }
 }
+
+export const addUserJson = (uid, passwd) => {
+  return {
+    command: 'addUser',
+    messageId: 'addUser',
+    uid,
+    passwd,
+  }
+}
+
+export const delUserJSON = id => {
+  return {
+    command: 'delUser',
+    messageId: 'delUser',
+    id,
+  }
+}
+
+export const updateUserPermissionLevelJSON = id => {
+  return {
+    command: 'updateUserPermissionLevel',
+    messageId: 'updateUserPermissionLevel',
+    id,
+    permission_level: 0,
+  }
+}