From ce619fbe792b157fe46795ab2116cef487e54c04 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 4 Sep 2023 14:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=AF=92=E4=B8=AD=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DisinfectionSetting.vue       | 19 +++++++++++++++++++
 src/components/Setting/components/Device.vue |  3 +--
 src/pages/Home.vue                           | 16 ++++++++--------
 src/store/modules/user.js                    |  2 +-
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 src/components/DisinfectionSetting.vue

diff --git a/src/components/DisinfectionSetting.vue b/src/components/DisinfectionSetting.vue
new file mode 100644
index 0000000..a0d09d1
--- /dev/null
+++ b/src/components/DisinfectionSetting.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="disinfection_setting_container">
+    <Device />
+  </div>
+</template>
+
+<script setup>
+import Device from 'cpns/Setting/components/Device'
+</script>
+
+<style lang="scss" scoped>
+.disinfection_setting_container {
+  margin-bottom: 19px;
+  height: 580px;
+  box-sizing: border-box;
+  background: #ffffff;
+  border-radius: 16px;
+}
+</style>
diff --git a/src/components/Setting/components/Device.vue b/src/components/Setting/components/Device.vue
index da769e2..fcb69ab 100644
--- a/src/components/Setting/components/Device.vue
+++ b/src/components/Setting/components/Device.vue
@@ -529,12 +529,11 @@ const setSprayLiquidVal = () => {
   padding: 20px;
   display: grid;
   overflow: scroll;
-  grid-template-rows: repeat(2, 1fr);
   grid-template-columns: repeat(1, 1fr);
   row-gap: 20px;
   padding-bottom: 20px;
   .row_wrap {
-    width: 726px;
+    // width: 726px;
     height: 80px;
     border-radius: 14px;
     background: #f6f6f6;
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index cafa734..d37f80e 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -112,10 +112,7 @@
           activeTab == 5 ? 'tab_btn style-btn active_btn' : 'style-btn tab_btn'
         "
         @click="changeTab(5)"
-        v-if="
-          userStore.loginUserPermission != 3 &&
-          operatorStore.disinfectStatus != 1
-        "
+        v-if="userStore.loginUserPermission != 3"
       >
         <svg
           xmlns="http://www.w3.org/2000/svg"
@@ -170,15 +167,17 @@
       :hideKeyBoard="hideKeyBoard"
       :input="input"
     />
-    <!-- <Progress
+    <Progress
       v-if="activeTab == 1 && !showOpertor"
       :changeShowOperator="changeShowOperator"
-    /> -->
-    <Progress :changeShowOperator="changeShowOperator" />
+    />
     <LiquidHandle v-if="activeTab == 2" :tabType="1" />
     <LiquidHandle v-if="activeTab == 3" :tabType="2" />
     <Test v-if="activeTab == 4" />
-    <Setting v-if="activeTab == 5" />
+    <Setting v-if="activeTab == 5 && operatorStore.disinfectStatus != 1" />
+    <DisinfectionSetting
+      v-if="activeTab == 5 && operatorStore.disinfectStatus == 1"
+    />
     <Audit v-if="activeTab == 6" />
     <div class="other_info">
       <p class="ip">IP {{ settingStore.deviceIp }}</p>
@@ -278,6 +277,7 @@ import SimpleKeyboard from 'cpns/SimpleKeyboard'
 import moment from 'moment'
 import Operator from 'cpns/Operator'
 import Audit from 'cpns/Audit'
+import DisinfectionSetting from 'cpns/DisinfectionSetting'
 import Progress from 'cpns/Progress'
 import LiquidHandle from 'cpns/LiquidHandle'
 import Setting from 'cpns/Setting'
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d8c3244..0e2f444 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,7 +7,7 @@ export const useUserStore = defineStore({
       allUserList: [],
       operUser: '',
       loginUser: '',
-      loginUserPermission: 3,
+      loginUserPermission: 2,
     }
   },
   // actions