From 2bf6ba47ce9c7382cb3c8c4bd0258a3705c6356c Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Sat, 25 May 2024 02:24:20 +0800
Subject: [PATCH] bh

---
 src/components/AddPreSetting.vue    | 12 +++++++++++-
 src/components/UpdatePreSetting.vue | 17 +++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/components/AddPreSetting.vue b/src/components/AddPreSetting.vue
index e5ef66d..01ce2f2 100644
--- a/src/components/AddPreSetting.vue
+++ b/src/components/AddPreSetting.vue
@@ -209,7 +209,7 @@
 import { ref, onMounted } from 'vue'
 import SimpleKeyboard from 'cpns/SimpleKeyboard'
 import { showSuccessToast, showFailToast } from 'vant'
-import { useSettingStore, useWebSocketStore, useOperatorStore } from '@/store'
+import { useSettingStore, useWebSocketStore, useOperatorStore, useFormulaStore } from '@/store'
 import { storeToRefs } from 'pinia'
 import {
   setSettingValJSON,
@@ -221,6 +221,7 @@ import LogPicker from 'cpns/dialogs/LogPicker'
 const settingStore = useSettingStore()
 const webSocketStore = useWebSocketStore()
 const operatorStore = useOperatorStore()
+const formulaStore = useFormulaStore()
 
 const max_humidity = ref('0')
 const continued_satur = ref('0')
@@ -253,6 +254,15 @@ const save = () => {
     showFailToast('配方名称不能为空')
     return
   }
+
+  let list = formulaStore?.formulaList;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].formula_id == formula_id.value) {
+      showFailToast('配方名称已存在')
+      return
+    }
+  }
+
   const data = {
     formula_id: formula_id.value,
     loglevel: logVal.value,
diff --git a/src/components/UpdatePreSetting.vue b/src/components/UpdatePreSetting.vue
index 90469a3..e8d191a 100644
--- a/src/components/UpdatePreSetting.vue
+++ b/src/components/UpdatePreSetting.vue
@@ -7,7 +7,7 @@
           v-model:value="stoped_gs"
           :formatter="formatter1"
           @done="setStopedGsVal"
-        ></my-input>
+        />
       </p>
     </div>
     <div class="row_wrap">
@@ -34,9 +34,9 @@
       <p class="title">消毒继续相对湿度(%RH)</p>
       <p class="num">
         <my-input type="number" class="field_font" theme="custom" close-text="配置"
-          v-model:value="stoped_humi"
-          :formatter="formatter9"
-          @done="setstoped_humiVal"
+          v-model:value="continued_humi"
+          :formatter="formatter10"
+          @done="setcontinued_humiVal"
         ></my-input>
       </p>
     </div>
@@ -279,6 +279,15 @@ const save = () => {
     showFailToast('配方名称不能为空')
     return
   }
+
+  let list = formulaStore?.formulaList;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].formula_id == formula_id.value && list[i].id != props.formulaInfo.id) {
+      showFailToast('配方名称已存在')
+      return
+    }
+  }
+
   const data = {
     id: props.formulaInfo.id,
     formula_id: formula_id.value,