From 389f0c9c430c7f2f40e62871edcddc73029cc0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Mon, 7 Jul 2025 15:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4=20=E6=AD=A3=E8=B4=9F=E5=8E=8B?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E5=88=A4=E6=96=AD=20=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formula/FormulaTable.vue |  2 +-
 src/components/home/PressureControl.vue | 17 +++++++++++++----
 src/components/setting/AddUser.vue      |  2 +-
 src/components/setting/ModifyPwd.vue    |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/formula/FormulaTable.vue b/src/components/formula/FormulaTable.vue
index e54c32b..72241fc 100644
--- a/src/components/formula/FormulaTable.vue
+++ b/src/components/formula/FormulaTable.vue
@@ -59,7 +59,7 @@ const deleteRecipe = (item: Formula.FormulaItem) => {
     type: 'warning',
   }).then(() => {
     if (formulaStore.selectedFormulaInfo?.formula_id === item.formula_id) {
-      ElMessage.warning('禁止修改正在执行的配方信息!')
+      ElMessage.warning('请在消毒设置取消此配方后再进行删除!')
       return
     }
     if (item.formula_id) {
diff --git a/src/components/home/PressureControl.vue b/src/components/home/PressureControl.vue
index dd84c45..603b4e9 100644
--- a/src/components/home/PressureControl.vue
+++ b/src/components/home/PressureControl.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { syncSendCmd } from 'apis/system'
+import { FtMessageBox } from 'libs/messageBox'
 import { useDeviceStore } from 'stores/deviceStore'
+import { useSealStore } from 'stores/sealStore'
 import { computed, onMounted, ref } from 'vue'
 
 import { useHomeStore } from '@/stores/homeStore'
@@ -39,12 +41,19 @@ onMounted(getPressureConfig)
 const deviceType = computed(() => {
   return __DEVICE_TYPE__
 })
-
+const sealStore = useSealStore()
+const sealInfo = computed(() => sealStore.sealInfo)
 // 用户选择后立即更新压力配置（支持仅选择类型的情况）
 const confirm = (val: string[]) => {
-  if (!val || !val.length)
-    return
-  homeStore.updatePressure(val)
+  // 判断设备当前的状态
+  if (sealInfo.value.workState === 'stopping' || sealInfo.value.workState === 'idle') {
+    if (!val || !val.length)
+      return
+    homeStore.updatePressure(val)
+  }
+  else {
+    FtMessageBox.error('密封性测试中,禁止修改正负压')
+  }
 }
 </script>
 
diff --git a/src/components/setting/AddUser.vue b/src/components/setting/AddUser.vue
index d9de6de..e2f4146 100644
--- a/src/components/setting/AddUser.vue
+++ b/src/components/setting/AddUser.vue
@@ -177,7 +177,7 @@ const rules = reactive<FormRules<UserForm>>({
     @cancel="onClose"
   >
     <div>
-      <el-form ref="userFormRef" :model="userForm" :rules="rules" label-width="auto" style="max-width: 400px">
+      <el-form ref="userFormRef" :model="userForm" :rules="rules" label-width="auto">
         <el-form-item v-if="!userForm.id" label="登录名：" prop="name">
           <ft-input v-model="userForm.name" name="name" placeholder="登录名" />
         </el-form-item>
diff --git a/src/components/setting/ModifyPwd.vue b/src/components/setting/ModifyPwd.vue
index 80d8889..aa1be15 100644
--- a/src/components/setting/ModifyPwd.vue
+++ b/src/components/setting/ModifyPwd.vue
@@ -138,7 +138,7 @@ const rules = reactive<FormRules>({
     @cancel="onClose"
   >
     <div>
-      <el-form ref="userFormRef" :model="userForm" label-width="auto" style="max-width: 400px" :rules="rules">
+      <el-form ref="userFormRef" :model="userForm" label-width="auto" :rules="rules">
         <div>
           <el-form-item
             v-show="false"