添加新预设按钮逻辑

src/components/Formula.vue

@@ -15,9 +15,11 @@
             : 'content_wrap'
         "
       >
-        <!-- v-for="item in formulaStore?.formulaList"
-          :key="item.id" -->
-        <div class="line">
+        <div
+          class="line"
+          v-for="item in formulaStore?.formulaList"
+          :key="item.id"
+        >
           <div class="username">{{ item?.formula_id }}</div>
           <div class="btns">
             <div class="btn" @click="delModalShow(item)">删除</div>
@@ -104,17 +106,12 @@
       </div>
     </div>
     <DelPreModal v-if="delPreModalVisible" :hideDelModal="hideDelModal" />
-    <AddPreModal
-      v-if="addPreModalVisible"
-      :hideAddNewPreModal="hideAddNewPreModal"
-    />
   </div>
 </template>
 
 <script setup>
 import { ref, onMounted } from 'vue'
 import DelPreModal from 'cpns/dialogs/DelPreModal'
-import AddPreModal from 'cpns/dialogs/AddPreModal'
 import PreSetting from './PreSetting'
 import { getAllFormulaJSON } from '@/mock/command'
 import { useWebSocketStore, useFormulaStore } from '@/store'
@@ -134,17 +131,6 @@ const hideDelModal = () => {
   delPreModalVisible.value = false
 }
 
-const addPreModalVisible = ref(false)
-
-// 新增预设
-const addNewPre = () => {
-  addPreModalVisible.value = true
-}
-
-const hideAddNewPreModal = () => {
-  addPreModalVisible.value = false
-}
-
 const isSettingVisible = ref(false)
 
 const showSetting = item => {
@@ -163,6 +149,11 @@ const runConfig = item => {
   console.log('run config', item)
 }
 
+const addNewPre = () => {
+  // 添加新预设
+  isSettingVisible.value = true
+}
+
 onMounted(() => {
   // webSocketStore.sendCommandMsg(getAllFormulaJSON)
 })

src/components/PreSetting.vue

@@ -97,32 +97,6 @@
         <p class="log">{{ logVal }}</p>
       </div>
     </div>
-    <!-- <div class="row_wrap" v-if="operatorStore.disinfectStatus != 1">
-      <p class="title">允许消毒最大湿度(%RH)</p>
-      <p class="num">
-        <van-field
-          :formatter="formatter5"
-          type="number"
-          v-model="max_humidity"
-          :clickable="true"
-          readonly
-          @click.stop="hideClickKey(7)"
-        />
-      </p>
-    </div>
-    <div class="row_wrap" v-if="operatorStore.disinfectStatus != 1">
-      <p class="title">预热时间(s)</p>
-      <p class="num">
-        <van-field
-          :formatter="formatter8"
-          type="number"
-          v-model="pre_heat_time_s"
-          :clickable="true"
-          readonly
-          @click.stop="hideClickKey(8)"
-        />
-      </p>
-    </div> -->
     <van-number-keyboard
       v-model="addLiquidConfigVal"
       :title="addLiquidConfigVal"